summaryrefslogtreecommitdiffstats
path: root/drivers/block/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
commit03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch)
tree88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/block/Makefile
parent257730f99381dd26e10b832fce4c94cae7ac1176 (diff)
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/block/Makefile')
-rw-r--r--drivers/block/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index f3543db2e..fa943cc48 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -106,6 +106,10 @@ ifeq ($(CONFIG_BLK_DEV_CMD640),y)
IDE_OBJS += cmd640.o
endif
+ifeq ($(CONFIG_BLK_DEV_IDE_PMAC),y)
+IDE_OBJS += ide-pmac.o
+endif
+
ifeq ($(CONFIG_BLK_DEV_IDEPCI),y)
IDE_OBJS += ide-pci.o
endif
@@ -269,10 +273,10 @@ endif
ifeq ($(CONFIG_PARIDE),y)
SUB_DIRS += paride
-MOD_SUB_DIRS += paride
+MOD_IN_SUB_DIRS += paride
else
ifeq ($(CONFIG_PARIDE),m)
- MOD_SUB_DIRS += paride
+ MOD_IN_SUB_DIRS += paride
endif
endif