summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-05 06:47:02 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-05 06:47:02 +0000
commit99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch)
tree3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/Makefile
parente73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff)
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile20
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index b31d2beb4..1585fed46 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 pcmcia
+ nubus tc ap1000 atm pcmcia i2c telephony
ifdef CONFIG_DIO
SUB_DIRS += dio
@@ -66,6 +66,15 @@ else
endif
endif
+ifeq ($(CONFIG_PHONE),y)
+SUB_DIRS += telephony
+MOD_SUB_DIRS += telephony
+else
+ ifeq ($(CONFIG_PHONE),m)
+ MOD_SUB_DIRS += telephony
+ endif
+endif
+
ifdef CONFIG_SGI_IP22
SUB_DIRS += sgi
MOD_SUB_DIRS += sgi
@@ -141,4 +150,13 @@ ifeq ($(CONFIG_HAMRADIO),y)
MOD_SUB_DIRS += net/hamradio
endif
+ifeq ($(CONFIG_I2C),y)
+SUB_DIRS += i2c
+MOD_SUB_DIRS += i2c
+else
+ ifeq ($(CONFIG_I2C),m)
+ MOD_SUB_DIRS += i2c
+ endif
+endif
+
include $(TOPDIR)/Rules.make