aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-05-10 07:08:37 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-10 07:08:37 -0400
commit2ecf042ef530dd0943e41d84b6344f507941af3e (patch)
tree73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/usb/Makefile
parent32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff)
parentde5603748af8bf7deac403e6ba92887f8d18e812 (diff)
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/usb/Makefile')
-rw-r--r--drivers/usb/Makefile7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 0ef090b1b37c..72464b586990 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER) += class/
23obj-$(CONFIG_USB_STORAGE) += storage/ 23obj-$(CONFIG_USB_STORAGE) += storage/
24obj-$(CONFIG_USB) += storage/ 24obj-$(CONFIG_USB) += storage/
25 25
26obj-$(CONFIG_USB_CATC) += net/
27obj-$(CONFIG_USB_KAWETH) += net/
28obj-$(CONFIG_USB_PEGASUS) += net/
29obj-$(CONFIG_USB_RTL8150) += net/
30obj-$(CONFIG_USB_USBNET) += net/
31obj-$(CONFIG_USB_ZD1201) += net/
32
33obj-$(CONFIG_USB_MDC800) += image/ 26obj-$(CONFIG_USB_MDC800) += image/
34obj-$(CONFIG_USB_MICROTEK) += image/ 27obj-$(CONFIG_USB_MICROTEK) += image/
35 28