diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index fa28c5b19b38..542a38873067 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1384,6 +1384,8 @@ source "drivers/input/touchscreen/focaltech_0flash_mmi/Kconfig"
 
 source "drivers/input/touchscreen/focaltech_0flash_v2_mmi/Kconfig"
 
+source "drivers/input/touchscreen/focaltech_touch_spi_mmi/Kconfig"
+
 source "drivers/input/touchscreen/focaltech_touch_v3/Kconfig"
 
 source "drivers/input/touchscreen/focaltech_v2_mmi/Kconfig"
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 94c176ef194d..b722f5fcb50d 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -124,6 +124,7 @@ obj-$(CONFIG_TOUCHSCREEN_FTS_TS) += stmicro_mmi/
 obj-$(CONFIG_TOUCHSCREEN_SYNA_TCM2) += synaptics_tcm2_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_MMI) += focaltech_0flash_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_0FLASH_V2_MMI) += focaltech_0flash_v2_mmi/
+obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_SPI_MMI)	+= focaltech_touch_spi_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3) += focaltech_touch_v3/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V2_MMI) += focaltech_v2_mmi/
 obj-$(CONFIG_INPUT_TOUCHSCREEN_ILI_9882_MMI) += ili9882_mmi/
diff --git a/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kbuild b/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kbuild
index 3f381ce53dbd..38bdfb3777a9 100644
--- a/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kbuild
+++ b/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kbuild
@@ -1,12 +1,8 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include \
-		-I$(TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_spi_mmi \
-		-I$(TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_spi_mmi/include \
-		-I$(TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_spi/focaltech_test \
-		-I$(TOP)/motorola/kernel/modules/drivers/input/touchscreen/focaltech_touch_spi/focaltech_test/supported_ic
+ccflags-y += -I$(srctree)/drivers/input/touchscreen/focaltech_touch_spi_mmi/include
+ccflags-y += -I$(srctree)/drivers/input/touchscreen/focaltech_touch_spi/focaltech_test
+ccflags-y += -I$(srctree)/drivers/input/touchscreen/focaltech_touch_spi/focaltech_test/supported_ic
 
-obj-m := focaltech_touch_spi_mmi.o
+obj-$(CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_SPI_MMI) += focaltech_touch_spi_mmi.o
 focaltech_touch_spi_mmi-objs += focaltech_core.o
 focaltech_touch_spi_mmi-objs += focaltech_ex_fun.o
 focaltech_touch_spi_mmi-objs += focaltech_ex_mode.o
diff --git a/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kconfig b/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kconfig
index 7951ba45d534..fac2b992c4c3 100644
--- a/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kconfig
+++ b/drivers/input/touchscreen/focaltech_touch_spi_mmi/Kconfig
@@ -1,16 +1,12 @@
-#
-# Focaltech Touchscreen driver configuration
-#
-
-config TOUCHSCREEN_FTS
-    bool "Focaltech Touchscreen"
-    default n
-    help
-      Say Y here if you have Focaltech touch panel.
-      If unsure, say N.
-      
-config TOUCHSCREEN_FTS_DIRECTORY
-    string "Focaltech ts directory name"
-    default "focaltech_touch"
-    depends on TOUCHSCREEN_FTS
-    
\ No newline at end of file
+#
+# Focaltech Touchscreen driver configuration
+#
+
+config INPUT_TOUCHSCREEN_FOCALTECH_SPI_MMI
+	tristate "FocalTech Touchscreen Driver SPI MMI"
+	default n
+	help
+	  Say Y here if you wish to include support for FocalTech Touchscreen SPI MMI.
+	  If unsure, say N.
+	  To compile this driver as a module, choose M here: the
+	  module will be called focaltech_touch_spi_mmi.