diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/usb/Makefile | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index be2c90a3f..9eb62b6a1 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -29,8 +29,8 @@ usb-scsi-objs := usb_scsi.o # Optional parts of multipart objects. -ifeq ($(CONFIG_USB_PROC),y) - usbcore-objs += proc_usb.o +ifeq ($(CONFIG_USB_DEVICEFS),y) + usbcore-objs += devio.o inode.o drivers.o devices.o endif ifeq ($(CONFIG_USB_SCSI_DEBUG),y) usb-scsi-objs += usb_scsi_debug.o @@ -52,6 +52,8 @@ obj-$(CONFIG_USB_OHCI_HCD) += usb-ohci-hcd.o obj-$(CONFIG_USB_MOUSE) += usbmouse.o input.o obj-$(CONFIG_USB_HID) += hid.o input.o obj-$(CONFIG_USB_KBD) += usbkbd.o input.o +obj-$(CONFIG_USB_GRAPHIRE) += graphire.o input.o +obj-$(CONFIG_USB_WMFORCE) += wmforce.o input.o obj-$(CONFIG_INPUT_KEYBDEV) += keybdev.o input.o obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o input.o obj-$(CONFIG_INPUT_JOYDEV) += joydev.o input.o @@ -65,7 +67,6 @@ obj-$(CONFIG_USB_AUDIO) += audio.o obj-$(CONFIG_USB_CPIA) += cpia.o obj-$(CONFIG_USB_DC2XX) += dc2xx.o obj-$(CONFIG_USB_SCSI) += usb-scsi.o -obj-$(CONFIG_USB_EZUSB) += ezusb.o obj-$(CONFIG_USB_USS720) += uss720.o obj-$(CONFIG_USB_DABUSB) += dabusb.o obj-$(CONFIG_USB_OV511) += ov511.o |