diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /drivers/Makefile | |
parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) |
Merge with 2.4.0-test7.
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 23a0579cd..874799bbe 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -7,12 +7,12 @@ # # Note 2! The CFLAGS definitions are now in the main makefile. -SUB_DIRS := block char net parport sound misc +SUB_DIRS := block char net parport sound misc media MOD_SUB_DIRS := $(SUB_DIRS) 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 \ - acpi mtd + acpi mtd input ifdef CONFIG_DIO SUB_DIRS += dio @@ -77,6 +77,15 @@ else endif endif +ifeq ($(CONFIG_INPUT),y) +SUB_DIRS += input +MOD_SUB_DIRS += input +else + ifeq ($(CONFIG_INPUT),m) + MOD_SUB_DIRS += input + endif +endif + ifeq ($(CONFIG_PHONE),y) SUB_DIRS += telephony MOD_SUB_DIRS += telephony |