summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWen Yi <wyi@nvidia.com>2011-02-04 13:55:07 -0800
committerVarun Colbert <vcolbert@nvidia.com>2011-02-04 18:17:18 -0800
commit69d22a7fcdeb77be75cf6b721d07f92a49df9752 (patch)
treee7b62f1427e15463aa22266ddf1177bf34c7d2f4 /include
parent6d7f2b17eaef400f920a9e9158bd55ce7f366a69 (diff)
Driver: Misc: Sensors: MPU: enable kxtf9 and ak8975
BUG 771526 Corrected the mismatched CONFIG_SENSOR_KXTF9 and CONFIG_SENSOR_AK8975 to CONFIG_SENSOR_KXTF9_MPU and CONFIG_SENSOR_AK8975_MPU 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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mpu.h b/include/linux/mpu.h
index f3ae55b42086..5756f5709a75 100644
--- a/include/linux/mpu.h
+++ b/include/linux/mpu.h
@@ -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