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/Kconfig | |
| parent | 77686517977e77d101c8a7b397717df00a88922b (diff) | |
| parent | d4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a (diff) | |
Merge branch 'mrst-touchscreen' into next
Conflicts:
drivers/input/touchscreen/Makefile
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 4a7a7a7f11b6..5766aea69f00 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -141,8 +141,6 @@ source "drivers/staging/adis16255/Kconfig" source "drivers/staging/xgifb/Kconfig" -source "drivers/staging/mrst-touchscreen/Kconfig" - source "drivers/staging/msm/Kconfig" source "drivers/staging/lirc/Kconfig" |