summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-31 12:38:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-31 12:38:04 +0200
commit5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch)
tree0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /drivers/input/touchscreen/Makefile
parentd89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff)
parent6e86841d05f371b5b9b86ce76c02aaee83352298 (diff)
downloadop-kernel-dev-5fbf24659b75356e2142e1f1b88f67b34cbc3e75.zip
op-kernel-dev-5fbf24659b75356e2142e1f1b88f67b34cbc3e75.tar.gz
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
-rw-r--r--drivers/input/touchscreen/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 39a804c..15cf290 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -7,6 +7,7 @@
wm97xx-ts-y := wm97xx-core.o
obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o
+obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) += atmel_tsadcc.o
obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o
obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o
obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o
OpenPOWER on IntegriCloud