diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 15:20:24 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 15:20:24 -0400 |
| commit | 92944c1c943647c7eb39c081feeecdd169f68ee4 (patch) | |
| tree | 1412deee46f6be19cf9b5a65a8d76ed4553866a8 /drivers/input/touchscreen/Makefile | |
| parent | 77686517977e77d101c8a7b397717df00a88922b (diff) | |
| parent | d4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a (diff) | |
Merge branch 'mrst-touchscreen' into next
Conflicts:
drivers/input/touchscreen/Makefile
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
| -rw-r--r-- | drivers/input/touchscreen/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 22e2d598dc69..f1bc8a416824 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile | |||
| @@ -23,6 +23,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o | |||
| 23 | obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o | 23 | obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o |
| 24 | obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o | 24 | obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o |
| 25 | obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o | 25 | obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o |
| 26 | obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o | ||
| 26 | obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o | 27 | obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o |
| 27 | obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o | 28 | obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o |
| 28 | obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o | 29 | obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o |