summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 14:09:31 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 14:09:31 +0200
commit896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (patch)
tree42f625d04b9fbff4cb93968f18efd91601df15a5 /drivers/hid/Makefile
parentMerge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-susp... (diff)
parentHID: Support for the 11.6" Cando panel (diff)
downloadlinux-896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68.tar.xz
linux-896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68.zip
Merge branch 'cando' into for-linus
Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index d1f1b448977d..ece32813586c 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o
obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
obj-$(CONFIG_HID_APPLE) += hid-apple.o
obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
+obj-$(CONFIG_HID_CANDO) += hid-cando.o
obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o