From: William Douglas Date: Wed, 5 Oct 2011 00:42:26 +0000 (+1100) Subject: x86,mrst: add mapping for bma023 X-Git-Tag: next-20111013~1^2~269 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fe6431307683b1169b79e4a4f151f4a104050b0f;p=karo-tx-linux.git x86,mrst: add mapping for bma023 There is now an upstream bma023 driver so instead of submitting ours we use that one. The defaults are just fine so it's a simple mapping entry. (Thanks go to Erik Andersson for incorporating the changes we needed into his version) Signed-off-by: William Douglas Signed-off-by: Alan Cox Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton --- diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index 40ad3b83fddc..cdd9043dab02 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c @@ -608,6 +608,7 @@ static void *msic_ocd_platform_data(void *info) } static const struct devs_id __initconst device_ids[] = { + {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data}, {"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data}, {"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data}, {"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},