diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/usb/atm/Makefile | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/atm/Makefile')
| -rw-r--r-- | drivers/usb/atm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile index 85099718c683..4c4a776ab1cd 100644 --- a/drivers/usb/atm/Makefile +++ b/drivers/usb/atm/Makefile | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | obj-$(CONFIG_USB_CXACRU) += cxacru.o | 5 | obj-$(CONFIG_USB_CXACRU) += cxacru.o |
| 6 | obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o | 6 | obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o |
| 7 | obj-$(CONFIG_USB_UEAGLEATM) += ueagle-atm.o | ||
| 7 | obj-$(CONFIG_USB_ATM) += usbatm.o | 8 | obj-$(CONFIG_USB_ATM) += usbatm.o |
| 8 | obj-$(CONFIG_USB_XUSBATM) += xusbatm.o | 9 | obj-$(CONFIG_USB_XUSBATM) += xusbatm.o |
| 9 | 10 | ||