patch-2.1.101 linux/drivers/block/Makefile

Next file: linux/drivers/block/acsi.c
Previous file: linux/drivers/block/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.100/linux/drivers/block/Makefile linux/drivers/block/Makefile
@@ -38,6 +38,22 @@
   endif
 endif
 
+ifeq ($(CONFIG_AMIGA_FLOPPY),y)
+  L_OBJS += amiflop.o
+else
+  ifeq ($(CONFIG_AMIGA_FLOPPY),m)
+    M_OBJS += amiflop.o
+  endif
+endif
+
+ifeq ($(CONFIG_ATARI_FLOPPY),y)
+  L_OBJS += ataflop.o
+else
+  ifeq ($(CONFIG_ATARI_FLOPPY),m)
+  M_OBJS += ataflop.o
+  endif
+endif
+
 ifeq ($(CONFIG_ATARI_ACSI),y)
   LX_OBJS += acsi.o
 else
@@ -91,9 +107,7 @@
 else
   ifeq ($(CONFIG_BLK_DEV_IDE),m)
   MIX_OBJS += ide.o
-  ifeq ($(CONFIG_PROC_FS),y)
-    M_OBJS += ide-proc.o
-  endif
+  # ide-mod includes ide-proc
   M_OBJS += ide-mod.o
   MX_OBJS += ide-probe.o
   endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov