diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
| commit | d3b8a1a8496c83bc4a3cc76505c29255af15572c (patch) | |
| tree | b56eb3ef27117bad5c516d6b647bdcd465d7659a /drivers/usb/atm/Makefile | |
| parent | 60564a313a5738960064d6c555ec066d9332f278 (diff) | |
| parent | 0ed0c0c48c508578c30aa58f755ca0d692636906 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/atm/Makefile')
| -rw-r--r-- | drivers/usb/atm/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile index 9213b8b97587..751f297be2ef 100644 --- a/drivers/usb/atm/Makefile +++ b/drivers/usb/atm/Makefile | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the rest of the USB drivers | 2 | # Makefile for USB ATM/xDSL drivers |
| 3 | # (the ones that don't fit into any other categories) | ||
| 4 | # | 3 | # |
| 5 | 4 | ||
| 6 | obj-$(CONFIG_USB_ATM) += usb_atm.o | 5 | obj-$(CONFIG_USB_CXACRU) += cxacru.o |
| 7 | obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o | 6 | obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o |
| 7 | obj-$(CONFIG_USB_ATM) += usbatm.o | ||
| 8 | obj-$(CONFIG_USB_XUSBATM) += xusbatm.o | ||