summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-cardhu-sensors.c
diff options
context:
space:
mode:
authorRobert Collins <rcollins@nvidia.com>2011-03-18 14:29:07 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:46:34 -0800
commit96a2824311f3d03b070c64ca1110f530c30e6fc5 (patch)
treee59dfa5601093a85d17b275062c6f143a03fd22a /arch/arm/mach-tegra/board-cardhu-sensors.c
parent346ecdff2f12d361442483000a0b878371d65226 (diff)
mpu3050: Motion Libraries: Invensense MPU code update to v3.3.3.
Update Invensense Motion Library (MPL) to production version v3.3.3. Previous version was engineering release and is not suitable for mass production. This version of the MPL most notably fixes problems with suspend/resume where touch screen would quit working during a suspend/resume cycle. Original-Change-Id: Id061bccf39adb34dda124f7ba18d5956885328dd Reviewed-on: http://git-master/r/23590 Reviewed-by: Robert R Collins <rcollins@nvidia.com> Tested-by: Robert R Collins <rcollins@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Original-Change-Id: Ibef0777548486e7ee2504d979e05bdd8fab3a7d8 Rebase-Id: R726205045a29cba87a941b8af5c8356c0543a6ff
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-sensors.c')
-rw-r--r--arch/arm/mach-tegra/board-cardhu-sensors.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c
index 086ff7edc4f4..d2e6da592177 100644
--- a/arch/arm/mach-tegra/board-cardhu-sensors.c
+++ b/arch/arm/mach-tegra/board-cardhu-sensors.c
@@ -584,7 +584,7 @@ static int __init cam_tca6416_init(void)
}
#endif
-#ifdef CONFIG_SENSORS_MPU3050
+#ifdef CONFIG_MPU_SENSORS_MPU3050
#define SENSOR_MPU_NAME "mpu3050"
static struct mpu3050_platform_data mpu3050_data = {
.int_config = 0x10,
@@ -672,11 +672,11 @@ int __init cardhu_sensors_init(void)
i2c_register_board_info(4, cardhu_i2c4_nct1008_board_info,
ARRAY_SIZE(cardhu_i2c4_nct1008_board_info));
-#ifdef CONFIG_SENSORS_MPU3050
+#ifdef CONFIG_MPU_SENSORS_MPU3050
cardhu_mpuirq_init();
#endif
-#ifdef CONFIG_SENSORS_MPU3050
+#ifdef CONFIG_MPU_SENSORS_MPU3050
i2c_register_board_info(2, mpu3050_i2c0_boardinfo,
ARRAY_SIZE(mpu3050_i2c0_boardinfo));
#endif