Merge branch 'mrst-touchscreen' into next
Dmitry Torokhov [Sun, 5 Sep 2010 19:20:24 +0000 (12:20 -0700)]
Conflicts:
drivers/input/touchscreen/Makefile

1  2 
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile

Simple merge
@@@ -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
@@@ -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
@@@ -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/