diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 12:20:24 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 12:20:24 -0700 |
commit | 92944c1c943647c7eb39c081feeecdd169f68ee4 (patch) | |
tree | 1412deee46f6be19cf9b5a65a8d76ed4553866a8 /drivers/staging/Makefile | |
parent | 77686517977e77d101c8a7b397717df00a88922b (diff) | |
parent | d4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a (diff) |
Merge branch 'mrst-touchscreen' into next
Conflicts:
drivers/input/touchscreen/Makefile
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index ca5c03eb3ce..bbe62e0dc2f 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -52,7 +52,6 @@ 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/ |