diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index cfcd9a3b7349..a0f1a52c7364 100755
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -348,7 +348,7 @@ config SENSORS_CAP_PROX
 	 Say yes here if you wish to include the Motorola
 	 Capacitive Proximity Sensor driver.
 
-config SENSORS_KXTF9
+config SENSORS_MOTO_KXTF9
 	tristate "KXTF9 Accelerometer"
 	default n
 	depends on I2C
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 1aadc107b1e8..49cabd69a137 100755
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -49,7 +49,7 @@ obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
 obj-$(CONFIG_WL127X_RFKILL)	+= wl127x-rfkill.o
 obj-$(CONFIG_APANIC)		+= apanic.o
 obj-$(CONFIG_SENSORS_AK8975)	+= akm8975.o
-obj-$(CONFIG_SENSORS_KXTF9)	+= kxtf9.o
+obj-$(CONFIG_SENSORS_MOTO_KXTF9)+= kxtf9.o
 obj-$(CONFIG_SENSORS_CAP_PROX)	+= cap_prox.o
 obj-$(CONFIG_SENSORS_MAX9635)	+= max9635.o
 obj-$(CONFIG_SENSORS_NCT1008)	+= nct1008.o
diff --git a/drivers/misc/kxtf9.c b/drivers/misc/kxtf9.c
index a7b54214ec1b..c238632521b2 100755
--- a/drivers/misc/kxtf9.c
+++ b/drivers/misc/kxtf9.c
@@ -31,7 +31,7 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 
-#include <linux/kxtf9.h>
+#include <linux/moto_kxtf9.h>
 
 #define NAME			"kxtf9"
 #define G_MAX			8000
diff --git a/include/linux/kxtf9.h b/include/linux/moto_kxtf9.h
similarity index 100%
rename from include/linux/kxtf9.h
rename to include/linux/moto_kxtf9.h