diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:54:53 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:54:53 -0400 |
| commit | f1275410a108ac38b59149d10bce3f35edd70876 (patch) | |
| tree | e86e0bab91fd1c2faa678b2c2c8442019bf4f92a /drivers/hid/Makefile | |
| parent | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (diff) | |
| parent | 00e7f9649b3061281fe4b463263da26155dc9be4 (diff) | |
Merge branch 'waltop' into for-linus
Diffstat (limited to 'drivers/hid/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 62ab1383a99b..c335605b9200 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -69,6 +69,7 @@ obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o | |||
| 69 | obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o | 69 | obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o |
| 70 | obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o | 70 | obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o |
| 71 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o | 71 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o |
| 72 | obj-$(CONFIG_HID_WALTOP) += hid-waltop.o | ||
| 72 | 73 | ||
| 73 | obj-$(CONFIG_USB_HID) += usbhid/ | 74 | obj-$(CONFIG_USB_HID) += usbhid/ |
| 74 | obj-$(CONFIG_USB_MOUSE) += usbhid/ | 75 | obj-$(CONFIG_USB_MOUSE) += usbhid/ |