From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sun, 5 Sep 2010 19:20:24 +0000 (-0700)
Subject: Merge branch 'mrst-touchscreen' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92944c1c943647c7eb39c081feeecdd169f68ee4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'mrst-touchscreen' into next

Conflicts:
	drivers/input/touchscreen/Makefile
---

92944c1c943647c7eb39c081feeecdd169f68ee4
diff --cc drivers/input/touchscreen/Makefile
index 22e2d598dc69,e8b5cac8d7eb..f1bc8a416824
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@@ -23,7 -19,7 +23,8 @@@ obj-$(CONFIG_TOUCHSCREEN_EETI)		+= eeti
  obj-$(CONFIG_TOUCHSCREEN_ELO)		+= elo.o
  obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o
  obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o
+ obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)	+= intel-mid-touch.o
 +obj-$(CONFIG_TOUCHSCREEN_LPC32XX)	+= lpc32xx_ts.o
  obj-$(CONFIG_TOUCHSCREEN_MC13783)	+= mc13783_ts.o
  obj-$(CONFIG_TOUCHSCREEN_MCS5000)	+= mcs5000_ts.o
  obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
diff --cc drivers/staging/Kconfig
index 4a7a7a7f11b6,74dc176a2288..5766aea69f00
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -141,19 -143,7 +141,17 @@@ source "drivers/staging/adis16255/Kconf
  
  source "drivers/staging/xgifb/Kconfig"
  
- source "drivers/staging/mrst-touchscreen/Kconfig"
- 
  source "drivers/staging/msm/Kconfig"
  
 +source "drivers/staging/lirc/Kconfig"
 +
 +source "drivers/staging/easycap/Kconfig"
 +
 +source "drivers/staging/solo6x10/Kconfig"
 +
 +source "drivers/staging/tidspbridge/Kconfig"
 +
 +source "drivers/staging/quickstart/Kconfig"
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING
diff --cc drivers/staging/Makefile
index ca5c03eb3ce3,cbd613cc6d33..bbe62e0dc2ff
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -52,9 -52,4 +52,8 @@@ 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/
  obj-$(CONFIG_MSM_STAGING)	+= msm/
 +obj-$(CONFIG_EASYCAP)		+= easycap/
 +obj-$(CONFIG_SOLO6X10)		+= solo6x10/
 +obj-$(CONFIG_TIDSPBRIDGE)	+= tidspbridge/
 +obj-$(CONFIG_ACPI_QUICKSTART)	+= quickstart/