---

yaml --- r: 199859 b: refs/heads/master c: a4cff8b h: refs/heads/master i: 199857: c7ca083 199855: 9bad214 v: v3
git-mirror · Jun 4, 2010 · a4e6041 · a4e6041
1 parent 709d088
commit a4e6041
Show file tree

Hide file tree

Showing 7 changed files with 880 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7636e0b0769e0f4f437ff33168d723f86e7c080
+refs/heads/master: a4cff8b82a3cd0c95348ad4ae28cee7a918a35cd
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -143,5 +143,7 @@ source "drivers/staging/adis16255/Kconfig"
 
 source "drivers/staging/xgifb/Kconfig"
 
+source "drivers/staging/mrst-touchscreen/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -52,3 +52,4 @@ obj-$(CONFIG_CXT1E1)		+= cxt1e1/
 obj-$(CONFIG_TI_ST)		+= ti-st/
 obj-$(CONFIG_ADIS16255)		+= adis16255/
 obj-$(CONFIG_FB_XGI)		+= xgifb/
+obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)	+= mrst-touchscreen/
diff --git a/trunk/drivers/staging/mrst-touchscreen/Kconfig b/trunk/drivers/staging/mrst-touchscreen/Kconfig
@@ -0,0 +1,7 @@
+config TOUCHSCREEN_INTEL_MID
+	tristate "Intel MID platform resistive touchscreen"
+	depends on INTEL_SCU_IPC
+	default y
+	help
+	  Say Y here if you have a Intel MID based touchscreen
+	  If unsure, say N.
diff --git a/trunk/drivers/staging/mrst-touchscreen/Makefile b/trunk/drivers/staging/mrst-touchscreen/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) := intel_mid_touch.o
+
+
diff --git a/trunk/drivers/staging/mrst-touchscreen/TODO b/trunk/drivers/staging/mrst-touchscreen/TODO
@@ -0,0 +1,2 @@
+- Move the driver to not think it is SPI (requires fixing some of the SFI
+  and firmware side)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) := intel_mid_touch.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Move the driver to not think it is SPI (requires fixing some of the SFI
		and firmware side)