aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-06-13 06:03:49 -0400
committerJiri Kosina <jkosina@suse.cz>2013-06-13 06:03:49 -0400
commit078328da5d5dfbd2b1333eb545bd89d6dfa984ef (patch)
treef27e524bca2e6631f788b0ebbf0e44ae03db5d5d /drivers/hid/Makefile
parent40e32ee6e475852f532c847ed1804b87f6531a67 (diff)
HID: fold ps3remote driver into generic Sony driver
Let's follow the structure we are trying to keep for most of the specific HID drivers, and let the separation follow the producing vendor. Merge functionality provided by ps3remote driver into hid-sony. Tested-by: David Dillow <dave@thedillows.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 2065694f57ab..833abcf19d68 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -92,7 +92,6 @@ hid-picolcd-y += hid-picolcd_debugfs.o
92endif 92endif
93 93
94obj-$(CONFIG_HID_PRIMAX) += hid-primax.o 94obj-$(CONFIG_HID_PRIMAX) += hid-primax.o
95obj-$(CONFIG_HID_PS3REMOTE) += hid-ps3remote.o
96obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \ 95obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \
97 hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \ 96 hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
98 hid-roccat-koneplus.o hid-roccat-konepure.o hid-roccat-kovaplus.o \ 97 hid-roccat-koneplus.o hid-roccat-konepure.o hid-roccat-kovaplus.o \