diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/Makefile | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 1a74fa394..b31d2beb4 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -11,7 +11,7 @@ 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 \ macintosh video dio zorro fc4 usb \ - nubus tc ap1000 atm + nubus tc ap1000 atm pcmcia ifdef CONFIG_DIO SUB_DIRS += dio @@ -22,8 +22,12 @@ ifdef CONFIG_PCI SUB_DIRS += pci endif -ifdef CONFIG_PCMCIA +ifeq ($(CONFIG_PCMCIA),y) SUB_DIRS += pcmcia +else + ifeq ($(CONFIG_PCMCIA),m) + MOD_SUB_DIRS += pcmcia + endif endif ifdef CONFIG_SBUS @@ -117,7 +121,6 @@ endif ifeq ($(CONFIG_AP1000),y) SUB_DIRS += ap1000 -ALL_SUB_DIRS += ap1000 endif ifeq ($(CONFIG_FC4),y) |