aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/atm/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 15:13:26 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 15:13:26 -0700
commitd3b8a1a8496c83bc4a3cc76505c29255af15572c (patch)
treeb56eb3ef27117bad5c516d6b647bdcd465d7659a /drivers/usb/atm/Makefile
parent60564a313a5738960064d6c555ec066d9332f278 (diff)
parent0ed0c0c48c508578c30aa58f755ca0d692636906 (diff)
downloadkernel_samsung_smdk4412-d3b8a1a8496c83bc4a3cc76505c29255af15572c.zip
kernel_samsung_smdk4412-d3b8a1a8496c83bc4a3cc76505c29255af15572c.tar.gz
kernel_samsung_smdk4412-d3b8a1a8496c83bc4a3cc76505c29255af15572c.tar.bz2
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/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile
index 9213b8b9..751f297 100644
--- a/drivers/usb/atm/Makefile
+++ b/drivers/usb/atm/Makefile
@@ -1,7 +1,8 @@
#
-# Makefile for the rest of the USB drivers
-# (the ones that don't fit into any other categories)
+# Makefile for USB ATM/xDSL drivers
#
-obj-$(CONFIG_USB_ATM) += usb_atm.o
+obj-$(CONFIG_USB_CXACRU) += cxacru.o
obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o
+obj-$(CONFIG_USB_ATM) += usbatm.o
+obj-$(CONFIG_USB_XUSBATM) += xusbatm.o