summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/Makefile
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 8f060eaef..7f81aa00f 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -10,7 +10,7 @@
SUB_DIRS := block char net misc sound
MOD_SUB_DIRS := $(SUB_DIRS) sbus
ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi cdrom isdn misc pnp \
- macintosh video dio zorro fc4
+ macintosh video dio zorro fc4 usb
ifdef CONFIG_DIO
SUB_DIRS += dio
@@ -48,6 +48,15 @@ SUB_DIRS += macintosh
MOD_SUB_DIRS += macintosh
endif
+ifeq ($(CONFIG_USB),y)
+SUB_DIRS += usb
+MOD_SUB_DIRS += usb
+else
+ ifeq ($(CONFIG_USB),m)
+ MOD_SUB_DIRS += usb
+ endif
+endif
+
ifdef CONFIG_SGI
SUB_DIRS += sgi
MOD_SUB_DIRS += sgi