[PATCH] PATCH 2.5: kconfig use of $ARCH (4_12)

 Use of the $ARCH variable is undocumented; the sparc and sparc64 ports
 define the bool constants CONFIG_SPARC32 and CONFIG_SPARC64 respectively
 for this purpose.

diff --git a/drivers/fc4/Config.in b/drivers/fc4/Config.in
index 47f3c71d5401c523c018662f027436a036f5df59..cbe1990fbb48d12dc33a824647ef07942a1260e1 100644 (file)
--- a/drivers/fc4/Config.in
+++ b/drivers/fc4/Config.in
@@ -7,13 +7,13 @@ comment 'Fibre Channel support'
 tristate 'Fibre Channel and FC4 SCSI support' CONFIG_FC4
 if [ ! "$CONFIG_FC4" = "n" ]; then
    comment 'FC4 drivers'
-   if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
+   if [ "$CONFIG_SPARC32" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
       tristate 'Sun SOC/Sbus' CONFIG_FC4_SOC
       tristate 'Sun SOC+ (aka SOCAL)' CONFIG_FC4_SOCAL
    fi
    comment 'FC4 targets'
    dep_tristate 'SparcSTORAGE Array 100 and 200 series' CONFIG_SCSI_PLUTO $CONFIG_SCSI
-   if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
+   if [ "$CONFIG_SPARC32" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
       dep_tristate 'Sun Enterprise Network Array (A5000 and EX500)' CONFIG_SCSI_FCAL $CONFIG_SCSI
    else
       dep_tristate 'Generic FC-AL disk driver' CONFIG_SCSI_FCAL $CONFIG_SCSI