fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / usb / input / Makefile

diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index d512d9f..1a24b5b 100644 (file)
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -3,6 +3,7 @@
 #
 
 # Multipart objects.
+wacom-objs     := wacom_wac.o wacom_sys.o
 usbhid-objs    := hid-core.o
 
 # Optional parts of multipart objects.
@@ -10,11 +11,8 @@ usbhid-objs  := hid-core.o
 ifeq ($(CONFIG_USB_HIDDEV),y)
        usbhid-objs     += hiddev.o
 endif
-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
@@ -22,6 +20,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
@@ -37,6 +38,7 @@ obj-$(CONFIG_USB_MOUSE)               += usbmouse.o
 obj-$(CONFIG_USB_MTOUCH)       += mtouchusb.o
 obj-$(CONFIG_USB_ITMTOUCH)     += itmtouch.o
 obj-$(CONFIG_USB_EGALAX)       += touchkitusb.o
+obj-$(CONFIG_USB_TOUCHSCREEN)  += usbtouchscreen.o
 obj-$(CONFIG_USB_POWERMATE)    += powermate.o
 obj-$(CONFIG_USB_WACOM)                += wacom.o
 obj-$(CONFIG_USB_ACECAD)       += acecad.o