diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:20:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:20:33 -0700 |
| commit | a12f66fccf2e266ad197df142b5ebafc6a169a8c (patch) | |
| tree | 9d0bc76f8aa9c42fb44ce5f5bf6b4b09f4efafed /drivers/usb/input/Makefile | |
| parent | 12dce6263d43daeb4e16fa4eb964c1c99fa4fa2e (diff) | |
| parent | bb0885900de49b5822d7e8c91c1adf9a0fcc228b (diff) | |
| download | blackbird-op-linux-a12f66fccf2e266ad197df142b5ebafc6a169a8c.tar.gz blackbird-op-linux-a12f66fccf2e266ad197df142b5ebafc6a169a8c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
Input: wistron - add support for Acer TravelMate 2424NWXCi
Input: wistron - fix setting up special buttons
Input: add KEY_BLUETOOTH and KEY_WLAN definitions
Input: add new BUS_VIRTUAL bus type
Input: add driver for stowaway serial keyboards
Input: make input_register_handler() return error codes
Input: remove cruft that was needed for transition to sysfs
Input: fix input module refcounting
Input: constify input core
Input: libps2 - rearrange exports
Input: atkbd - support Microsoft Natural Elite Pro keyboards
Input: i8042 - disable MUX mode on Toshiba Equium A110
Input: i8042 - get rid of polling timer
Input: send key up events at disconnect
Input: constify psmouse driver
Input: i8042 - add Amoi to the MUX blacklist
Input: logips2pp - add sugnature 56 (Cordless MouseMan Wheel), cleanup
Input: add driver for Touchwin serial touchscreens
Input: add driver for Touchright serial touchscreens
Input: add driver for Penmount serial touchscreens
...
Diffstat (limited to 'drivers/usb/input/Makefile')
| -rw-r--r-- | drivers/usb/input/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index 48551be324ac..295f459d1079 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -15,7 +15,7 @@ ifeq ($(CONFIG_USB_HIDINPUT),y) usbhid-objs += hid-input.o endif ifeq ($(CONFIG_HID_PID),y) - usbhid-objs += pid.o + usbhid-objs += hid-pidff.o endif ifeq ($(CONFIG_LOGITECH_FF),y) usbhid-objs += hid-lgff.o @@ -23,6 +23,9 @@ endif ifeq ($(CONFIG_THRUSTMASTER_FF),y) usbhid-objs += hid-tmff.o endif +ifeq ($(CONFIG_ZEROPLUS_FF),y) + usbhid-objs += hid-zpff.o +endif ifeq ($(CONFIG_HID_FF),y) usbhid-objs += hid-ff.o endif |
