diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index f750d36360ed..195ae387a022 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1350,4 +1350,7 @@ config TOUCHSCREEN_ROHM_BU21023
 config TOUCHSCREEN_VTL_CT36X
 	tristate "VTL touchscreens support"
 
+config TOUCHSCREEN_GT1X
+	tristate "GT1X touchscreens support"
+
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index aafb054229b8..a085903d3972 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -118,3 +118,4 @@ obj-$(CONFIG_TOUCHSCREEN_ZFORCE)	+= zforce_ts.o
 obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)	+= colibri-vf50-ts.o
 obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o
 obj-$(CONFIG_TOUCHSCREEN_VTL_CT36X)	+= vtl_ts/
+obj-$(CONFIG_TOUCHSCREEN_GT1X)		+= gt1x/
diff --git a/drivers/input/touchscreen/gt1x/gt1x_extents.c b/drivers/input/touchscreen/gt1x/gt1x_extents.c
index dc16c91ad98a..3701d3e8dfc5 100644
--- a/drivers/input/touchscreen/gt1x/gt1x_extents.c
+++ b/drivers/input/touchscreen/gt1x/gt1x_extents.c
@@ -28,7 +28,7 @@
 #include <linux/miscdevice.h>
 #include <linux/input.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/proc_fs.h>	/*proc */
 
 #include <asm/ioctl.h>
diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.h b/drivers/input/touchscreen/gt1x/gt1x_generic.h
index 2b3d40db49cc..09721a62dbeb 100644
--- a/drivers/input/touchscreen/gt1x/gt1x_generic.h
+++ b/drivers/input/touchscreen/gt1x/gt1x_generic.h
@@ -40,7 +40,7 @@
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #ifdef CONFIG_HAS_EARLYSUSPEND
 #include <linux/earlysuspend.h>
 #endif
diff --git a/drivers/input/touchscreen/gt1x/gt1x_tools.c b/drivers/input/touchscreen/gt1x/gt1x_tools.c
index c6d376be7c9f..bf442dca73be 100644
--- a/drivers/input/touchscreen/gt1x/gt1x_tools.c
+++ b/drivers/input/touchscreen/gt1x/gt1x_tools.c
@@ -18,7 +18,7 @@
  */
 
 #include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <generated/utsrelease.h>
 #include "gt1x_generic.h"
diff --git a/drivers/input/touchscreen/gt1x/gt1x_update.c b/drivers/input/touchscreen/gt1x/gt1x_update.c
index 295462a80a20..0979bb32d52f 100644
--- a/drivers/input/touchscreen/gt1x/gt1x_update.c
+++ b/drivers/input/touchscreen/gt1x/gt1x_update.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/namei.h>
 #include <linux/mount.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "gt1x_generic.h"
 #if (GTP_HOTKNOT || GTP_HEADER_FW_UPDATE)