summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-19 01:28:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-19 01:28:40 +0000
commit8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch)
treeb88cc5a6cd513a04a512b7e6215c873c90a1c5dd /drivers/Makefile
parentf01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff)
Merge with 2.3.99-pre1.
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile17
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 1d4653233..eca864b62 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -9,9 +9,9 @@
SUB_DIRS := block char net parport sound misc
MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi sbus cdrom isdn pnp i2o ieee1394 \
- macintosh video dio zorro fc4 usb \
- nubus tc atm pcmcia i2c telephony
+ALL_SUB_DIRS := $(SUB_DIRS) pci sgi ide scsi sbus cdrom isdn pnp i2o \
+ ieee1394 macintosh video dio zorro fc4 \
+ usb nubus tc atm pcmcia i2c telephony
ifdef CONFIG_DIO
SUB_DIRS += dio
@@ -94,6 +94,17 @@ else
endif
endif
+# If CONFIG_IDE is set, the core of ATA support will be added to the kernel,
+# but some of the low-level things may also be modules.
+ifeq ($(CONFIG_IDE),y)
+SUB_DIRS += ide
+MOD_SUB_DIRS += ide
+else
+ ifeq ($(CONFIG_IDE),m)
+ MOD_SUB_DIRS += ide
+ endif
+endif
+
# If CONFIG_SCSI is set, the core of SCSI support will be added to the kernel,
# but some of the low-level things may also be modules.
ifeq ($(CONFIG_SCSI),y)