diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
commit | 1c5c0c934f91fbce2825acbb849e98781e774c1d (patch) | |
tree | 12b5ae03516d4103bc070e4579ae1f7f71c27d24 /drivers/Makefile | |
parent | 4fe70c31de87823ac9e804f4795589ba74dc6971 (diff) |
Merge with 2.1.47. Some more cleanup and module fixes.
Diffstat (limited to 'drivers/Makefile')
-rw-r--r-- | drivers/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index e7b86ed1e..df324c4bb 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -7,9 +7,9 @@ # # Note 2! The CFLAGS definitions are now in the main makefile... -SUB_DIRS := block char net pnp #streams +SUB_DIRS := block char net misc #streams MOD_SUB_DIRS := $(SUB_DIRS) sbus -ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi sound cdrom isdn pnp +ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi sound cdrom isdn misc pnp ifdef CONFIG_PCI SUB_DIRS += pci @@ -42,6 +42,15 @@ else endif endif +ifeq ($(CONFIG_PNP),y) +SUB_DIRS += pnp +MOD_SUB_DIRS += pnp +else + ifeq ($(CONFIG_PNP),m) + MOD_SUB_DIRS += pnp + endif +endif + ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR),) SUB_DIRS += cdrom MOD_SUB_DIRS += cdrom |