git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
drivers
/
hid
/
usbhid
/
Makefile
diff --git
a/drivers/hid/usbhid/Makefile
b/drivers/hid/usbhid/Makefile
index
5c460fc
..
1329ecb
100644
(file)
--- a/
drivers/hid/usbhid/Makefile
+++ b/
drivers/hid/usbhid/Makefile
@@
-13,9
+13,6
@@
endif
ifeq ($(CONFIG_HID_PID),y)
usbhid-objs += hid-pidff.o
endif
-ifeq ($(CONFIG_HID_FF),y)
- usbhid-objs += hid-ff.o
-endif
obj-$(CONFIG_USB_HID) += usbhid.o
obj-$(CONFIG_USB_KBD) += usbkbd.o