diff options
author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/usb/Makefile | |
parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/Makefile')
-rw-r--r-- | drivers/usb/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index a61d4433a989..d79cd218a551 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
@@ -9,6 +9,7 @@ obj-$(CONFIG_USB) += core/ | |||
9 | obj-$(CONFIG_USB_MON) += mon/ | 9 | obj-$(CONFIG_USB_MON) += mon/ |
10 | 10 | ||
11 | obj-$(CONFIG_USB_EHCI_HCD) += host/ | 11 | obj-$(CONFIG_USB_EHCI_HCD) += host/ |
12 | obj-$(CONFIG_USB_ISP116X_HCD) += host/ | ||
12 | obj-$(CONFIG_USB_OHCI_HCD) += host/ | 13 | obj-$(CONFIG_USB_OHCI_HCD) += host/ |
13 | obj-$(CONFIG_USB_UHCI_HCD) += host/ | 14 | obj-$(CONFIG_USB_UHCI_HCD) += host/ |
14 | obj-$(CONFIG_USB_SL811_HCD) += host/ | 15 | obj-$(CONFIG_USB_SL811_HCD) += host/ |
@@ -31,6 +32,7 @@ obj-$(CONFIG_USB_MOUSE) += input/ | |||
31 | obj-$(CONFIG_USB_MTOUCH) += input/ | 32 | obj-$(CONFIG_USB_MTOUCH) += input/ |
32 | obj-$(CONFIG_USB_POWERMATE) += input/ | 33 | obj-$(CONFIG_USB_POWERMATE) += input/ |
33 | obj-$(CONFIG_USB_WACOM) += input/ | 34 | obj-$(CONFIG_USB_WACOM) += input/ |
35 | obj-$(CONFIG_USB_ACECAD) += input/ | ||
34 | obj-$(CONFIG_USB_XPAD) += input/ | 36 | obj-$(CONFIG_USB_XPAD) += input/ |
35 | 37 | ||
36 | obj-$(CONFIG_USB_DABUSB) += media/ | 38 | obj-$(CONFIG_USB_DABUSB) += media/ |