patch-2.4.0-test9 linux/drivers/usb/Makefile

• Lines: 45
• Date: Wed Sep 27 13:53:56 2000
• Orig file: v2.4.0-test8/linux/drivers/usb/Makefile
• Orig date: Mon Aug 28 16:59:14 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/usb/Makefile linux/drivers/usb/Makefile
@@ -6,7 +6,6 @@
 
 SUB_DIRS	:=
 MOD_SUB_DIRS	:= $(SUB_DIRS)
-MOD_IN_SUB_DIRS	:= $(SUB_DIRS)
 ALL_SUB_DIRS	:= $(SUB_DIRS) serial storage
 
 # The target object and module list name.
@@ -65,6 +64,7 @@
 obj-$(CONFIG_USB_DSBR)		+= dsbr100.o
 obj-$(CONFIG_USB_MICROTEK)	+= microtek.o
 obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
+obj-$(CONFIG_USB_NET1080)	+= net1080.o
 
 # Object files in subdirectories
 
@@ -73,7 +73,7 @@
 	obj-y += serial/usb-serial.o
 else
 	ifeq ($(CONFIG_USB_SERIAL),m)
-		MOD_IN_SUB_DIRS += serial
+		MOD_SUB_DIRS += serial
 	endif
 endif
 
@@ -82,7 +82,7 @@
 	obj-y += storage/storage.o
 else
 	ifeq ($(CONFIG_USB_STORAGE),m)
-		MOD_IN_SUB_DIRS += storage
+		MOD_SUB_DIRS += storage
 	endif
 endif
 
@@ -98,10 +98,6 @@
 
 obj-m		:= $(filter-out $(obj-y), $(obj-m))
 int-m		:= $(filter-out $(int-y), $(int-m))
-
-# Take multi-part drivers out of obj-y and put components in.
-
-obj-y		:= $(filter-out $(list-multi), $(obj-y)) $(int-y)
 
 # Translate to Rules.make lists.