diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:18:05 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:18:05 +0100 |
| commit | 4a247a4119ee932e06e985e0a95a13c3eed4715b (patch) | |
| tree | 42b6a7c9edf2f40c7b645a493d63bdb67e5f7100 /drivers/hid/Makefile | |
| parent | 77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51 (diff) | |
| parent | 4d5df5d11e8027c11c1079205757527cbaade62d (diff) | |
| download | linux-4a247a4119ee932e06e985e0a95a13c3eed4715b.tar.gz | |
Merge branch 'upstream' into for-linus
Conflicts: drivers/hid/Makefile
Diffstat (limited to 'drivers/hid/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 7d926719e21b..22f1d16cd79c 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_HID_PRIMAX) += hid-primax.o obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \ hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \ hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o +obj-$(CONFIG_HID_SAITEK) += hid-saitek.o obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o obj-$(CONFIG_HID_SONY) += hid-sony.o @@ -74,6 +75,7 @@ obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o +obj-$(CONFIG_HID_TIVO) += hid-tivo.o obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o |