summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-ventana-sensors.c
diff options
context:
space:
mode:
authorvsalve <vsalve@nvidia.com>2011-03-15 15:49:09 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:46:34 -0800
commit346ecdff2f12d361442483000a0b878371d65226 (patch)
treede15da8aedf27b0398a674b8fd7be6ec669ea5aa /arch/arm/mach-tegra/board-ventana-sensors.c
parentd0ef3a47f977409e09bdd787f48a2abb3c016ddf (diff)
ARM:tegra:ventana:Sensors Invensense MPU code v3.3.3
Original-Change-Id: I5e96ea2280326cb91aa4f32c56b88aece9c7aac2 Reviewed-on: http://git-master/r/22991 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: Rf0e1503e3e9c4dcfac7295844f476593968e7737
Diffstat (limited to 'arch/arm/mach-tegra/board-ventana-sensors.c')
-rw-r--r--arch/arm/mach-tegra/board-ventana-sensors.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-sensors.c b/arch/arm/mach-tegra/board-ventana-sensors.c
index c65dc7e65099..7842a5c0a74c 100644
--- a/arch/arm/mach-tegra/board-ventana-sensors.c
+++ b/arch/arm/mach-tegra/board-ventana-sensors.c
@@ -352,14 +352,14 @@ static struct i2c_board_info ventana_i2c8_board_info[] = {
},
};
-#ifdef CONFIG_SENSORS_MPU3050
+#ifdef CONFIG_MPU_SENSORS_MPU3050
#define SENSOR_MPU_NAME "mpu3050"
static struct mpu3050_platform_data mpu3050_data = {
.int_config = 0x10,
.orientation = { 0, -1, 0, -1, 0, 0, 0, 0, -1 }, /* Orientation matrix for MPU on ventana */
.level_shifter = 0,
.accel = {
-#ifdef CONFIG_SENSORS_KXTF9_MPU
+#ifdef CONFIG_MPU_SENSORS_KXTF9
.get_slave_descr = get_accel_slave_descr,
#else
.get_slave_descr = NULL,
@@ -371,7 +371,7 @@ static struct mpu3050_platform_data mpu3050_data = {
},
.compass = {
-#ifdef CONFIG_SENSORS_AK8975_MPU
+#ifdef CONFIG_MPU_SENSORS_AK8975
.get_slave_descr = get_compass_slave_descr,
#else
.get_slave_descr = NULL,
@@ -409,7 +409,7 @@ int __init ventana_sensors_init(void)
#ifdef CONFIG_SENSORS_AK8975
ventana_akm8975_init();
#endif
-#ifdef CONFIG_SENSORS_MPU3050
+#ifdef CONFIG_MPU_SENSORS_MPU3050
ventana_mpuirq_init();
#endif
ventana_camera_init();
@@ -446,7 +446,7 @@ int __init ventana_sensors_init(void)
ARRAY_SIZE(ventana_i2c8_board_info));
-#ifdef CONFIG_SENSORS_MPU3050
+#ifdef CONFIG_MPU_SENSORS_MPU3050
i2c_register_board_info(0, mpu3050_i2c0_boardinfo,
ARRAY_SIZE(mpu3050_i2c0_boardinfo));
#endif