Driver: Misc: Sensors: MPU: enable kxtf9 and ak8975
Wen Yi [Fri, 4 Feb 2011 21:55:07 +0000 (13:55 -0800)]
BUG 771526

Corrected the mismatched CONFIG_SENSOR_KXTF9 and
CONFIG_SENSOR_AK8975 to CONFIG_SENSOR_KXTF9_MPU
and CONFIG_SENSOR_AK8975_MPU

Original-Change-Id: I760bfdd5cbdd91acdf9ce10ee5be5fcfa0a9c5ab
Reviewed-on: http://git-master/r/18377
Reviewed-by: Wen Yi <wyi@nvidia.com>
Tested-by: Wen Yi <wyi@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Tested-by: Robert R Collins <rcollins@nvidia.com>
Reviewed-by: Jeremy Wyman <jwyman@nvidia.com>
Tested-by: Jeremy Wyman <jwyman@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R7428db1a61c508ae56afc6fd590f750afa8ca6a5

include/linux/mpu.h

index f3ae55b..5756f57 100644 (file)
@@ -326,7 +326,7 @@ struct ext_slave_descr *kxsd9_get_slave_descr(void);
 #define get_accel_slave_descr kxsd9_get_slave_descr
 #endif
 
-#ifdef CONFIG_SENSORS_KXTF9    /* Kionix accelerometer */
+#ifdef CONFIG_SENSORS_KXTF9_MPU        /* Kionix accelerometer */
 struct ext_slave_descr *kxtf9_get_slave_descr(void);
 #undef get_accel_slave_descr
 #define get_accel_slave_descr kxtf9_get_slave_descr
@@ -369,7 +369,7 @@ struct ext_slave_descr *mma8451_get_slave_descr(void);
 */
 #define get_compass_slave_descr NULL
 
-#ifdef CONFIG_SENSORS_AK8975   /* AKM compass */
+#ifdef CONFIG_SENSORS_AK8975_MPU       /* AKM compass */
 struct ext_slave_descr *ak8975_get_slave_descr(void);
 #undef get_compass_slave_descr
 #define get_compass_slave_descr ak8975_get_slave_descr