diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/usb/Makefile | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 36e476dd9123..bb36a1c1dbb3 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
| @@ -15,10 +15,9 @@ obj-$(CONFIG_USB_OHCI_HCD) += host/ | |||
| 15 | obj-$(CONFIG_USB_UHCI_HCD) += host/ | 15 | obj-$(CONFIG_USB_UHCI_HCD) += host/ |
| 16 | obj-$(CONFIG_USB_SL811_HCD) += host/ | 16 | obj-$(CONFIG_USB_SL811_HCD) += host/ |
| 17 | obj-$(CONFIG_ETRAX_USB_HOST) += host/ | 17 | obj-$(CONFIG_ETRAX_USB_HOST) += host/ |
| 18 | obj-$(CONFIG_USB_OHCI_AT91) += host/ | ||
| 18 | 19 | ||
| 19 | obj-$(CONFIG_USB_ACM) += class/ | 20 | obj-$(CONFIG_USB_ACM) += class/ |
| 20 | obj-$(CONFIG_USB_AUDIO) += class/ | ||
| 21 | obj-$(CONFIG_USB_MIDI) += class/ | ||
| 22 | obj-$(CONFIG_USB_PRINTER) += class/ | 21 | obj-$(CONFIG_USB_PRINTER) += class/ |
| 23 | 22 | ||
| 24 | obj-$(CONFIG_USB_STORAGE) += storage/ | 23 | obj-$(CONFIG_USB_STORAGE) += storage/ |
| @@ -48,6 +47,7 @@ obj-$(CONFIG_USB_SN9C102) += media/ | |||
| 48 | obj-$(CONFIG_USB_STV680) += media/ | 47 | obj-$(CONFIG_USB_STV680) += media/ |
| 49 | obj-$(CONFIG_USB_VICAM) += media/ | 48 | obj-$(CONFIG_USB_VICAM) += media/ |
| 50 | obj-$(CONFIG_USB_W9968CF) += media/ | 49 | obj-$(CONFIG_USB_W9968CF) += media/ |
| 50 | obj-$(CONFIG_USB_ZC0301) += media/ | ||
| 51 | 51 | ||
| 52 | obj-$(CONFIG_USB_CATC) += net/ | 52 | obj-$(CONFIG_USB_CATC) += net/ |
| 53 | obj-$(CONFIG_USB_KAWETH) += net/ | 53 | obj-$(CONFIG_USB_KAWETH) += net/ |