Cleanup drivers/fusion/* build

Don't shortcut from drivers/Makefile to
drivers/message/{fusion,i2o}/Makefile, but use intermediate
drivers/message/Makefile.

Cleanup drivers/message/fusion/Config.in and get rid of unnecessary
CONFIG_FUSION_BOOT.

diff --git a/Makefile b/Makefile
index 787560484c9779a0e2508699b2532c8d9633cd3d..f539ff55e5d245fed3cd7b50d2e122b5daffbb08 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
 DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
 DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
-DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o
+DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
 DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
 
 ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
@@ -167,7 +167,7 @@ DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
 DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
 DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
-DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
+DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
 DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
 DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
 DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o

diff --git a/drivers/Makefile b/drivers/Makefile
index 983325c428de29011809aa7dc3b73bbfc0e401c0..0591faa60339b32150997d5a2edb87e0af957a39 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -7,8 +7,8 @@
 
 
 mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \
-               message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
-               fc4 net/hamradio i2c acpi bluetooth input/serio \
+               message scsi md ieee1394 pnp isdn atm \
+               fc4 i2c acpi bluetooth input/serio \
                input/gameport parport hotplug
 
 subdir-y :=    base char block net misc media cdrom
@@ -35,8 +35,8 @@ subdir-$(CONFIG_PHONE)                += telephony
 subdir-$(CONFIG_SGI)           += sgi
 subdir-$(CONFIG_IDE)           += ide
 subdir-$(CONFIG_SCSI)          += scsi
-subdir-$(CONFIG_I2O)           += message/i2o
-subdir-$(CONFIG_FUSION)                += message/fusion
+subdir-$(CONFIG_I2O)           += message
+subdir-$(CONFIG_FUSION)                += message
 subdir-$(CONFIG_MD)            += md
 subdir-$(CONFIG_IEEE1394)      += ieee1394
 subdir-$(CONFIG_PNP)           += pnp

diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index e02323f8fd003b4fe8d7e561199092044c125a8d..a44f35f604e05b04b772d23a172766b0449f94ae 100644 (file)
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -199,7 +199,7 @@ struct seq_operations partitions_op = {
 
 
 extern int blk_dev_init(void);
-#ifdef CONFIG_FUSION_BOOT
+#ifdef CONFIG_FUSION
 extern int fusion_init(void);
 #endif
 extern int net_dev_init(void);
@@ -216,7 +216,7 @@ int __init device_init(void)
 #ifdef CONFIG_I2O
        i2o_init();
 #endif
-#ifdef CONFIG_FUSION_BOOT
+#ifdef CONFIG_FUSION
        fusion_init();
 #endif
 #ifdef CONFIG_FC4_SOC

diff --git a/drivers/message/Makefile b/drivers/message/Makefile
new file mode 100644 (file)
index 0000000..7b16032
--- /dev/null
+++ b/drivers/message/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for MPT based block devices
+#
+
+O_TARGET := message.o
+
+mod-subdirs := message/i2o message/fusion 
+
+subdir-$(CONFIG_I2O)           += i2o
+ifeq($(CONFIG_I2O),y)
+  obj-y += i2o/i2o.o
+endif
+
+subdir-$(CONFIG_FUSION)                += fusion
+ifeq($(CONFIG_FUSION),y)
+  obj-y += fusion/fusion.o
+endif

diff --git a/drivers/message/fusion/Config.in b/drivers/message/fusion/Config.in
index 4d04055d83fac8b646e37e1d8fba5295e0a398bf..5d865a19579619836b5aecfe604dd1e2e8eea863 100644 (file)
--- a/drivers/message/fusion/Config.in
+++ b/drivers/message/fusion/Config.in
@@ -5,35 +5,21 @@ dep_tristate "Fusion MPT (base + ScsiHost) drivers" CONFIG_FUSION $CONFIG_SCSI $
 
 if [ "$CONFIG_FUSION" = "y" -o "$CONFIG_FUSION" = "m" ]; then
 
-  if [ "$CONFIG_BLK_DEV_SD" = "y" -a "$CONFIG_FUSION" = "y" ]; then
-    define_bool CONFIG_FUSION_BOOT y
+  if [ "$CONFIG_FUSION" = "y" ]; then
     comment "(ability to boot linux kernel from Fusion device is ENABLED!)"
   else
-    define_bool CONFIG_FUSION_BOOT n
     comment "(ability to boot linux kernel from Fusion device is DISABLED!)"
   fi
 
-  if [ "$CONFIG_MODULES" = "y" ]; then
-    #  How can we force these options to module or nothing?
-    dep_tristate "  Enhanced SCSI error reporting" CONFIG_FUSION_ISENSE $CONFIG_FUSION m
-    dep_tristate "  Fusion MPT misc device (ioctl) driver" CONFIG_FUSION_CTL $CONFIG_FUSION m
-  fi
+  # Modular only
+  dep_tristate "  Enhanced SCSI error reporting" CONFIG_FUSION_ISENSE $CONFIG_FUSION m
+  dep_tristate "  Fusion MPT misc device (ioctl) driver" CONFIG_FUSION_CTL $CONFIG_FUSION m
 
   dep_tristate "  Fusion MPT LAN driver" CONFIG_FUSION_LAN $CONFIG_FUSION $CONFIG_NET
   if [ "$CONFIG_FUSION_LAN" != "n" ]; then
     define_bool CONFIG_NET_FC y
   fi
 
-else
-
-  define_bool CONFIG_FUSION_BOOT n
-  # These <should> be define_tristate, but we leave them define_bool
-  # for backward compatibility with pre-linux-2.2.15 kernels.
-  # (Bugzilla:fibrebugs, #384)
-  define_bool CONFIG_FUSION_ISENSE n
-  define_bool CONFIG_FUSION_CTL n
-  define_bool CONFIG_FUSION_LAN n
-
 fi
 
 endmenu