summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorPaul Mundt2010-05-31 06:14:26 +0200
committerPaul Mundt2010-05-31 06:14:26 +0200
commitd5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch)
tree4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/hid/Makefile
parentARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports (diff)
parentLinux 2.6.35-rc1 (diff)
downloadkernel-qcow2-linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.gz
kernel-qcow2-linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.xz
kernel-qcow2-linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 22e47eaeea32..987fa0627367 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_HID_QUANTA) += hid-quanta.o
obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o
+obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o
obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o