summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-08-31 22:20:55 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-01 19:43:02 -0700
commitaff4c343614f0c9980352810df70969821cba95f (patch)
treeb3eca2f759910ec26dd67bf2fc25380ac59b9c32 /drivers/staging/Makefile
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
downloadblackbird-op-linux-aff4c343614f0c9980352810df70969821cba95f.tar.gz
blackbird-op-linux-aff4c343614f0c9980352810df70969821cba95f.zip
Staging: mrst_touchscreen - clean up input side
Fix most of the stuff that Dmitry pointed out. This leaves the mutex in IRQ and misuse of SPI to sort out. Also fix the build bits so it actually builds in staging - whoops. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 9fa25133874a..d071bac73acc 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -52,5 +52,5 @@ 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_TOUCHSCREEN_INTEL_MID) += mrst-touchscreen/
obj-$(CONFIG_MSM_STAGING) += msm/
OpenPOWER on IntegriCloud