[PATCH] Network Options and Network Devices together

This patch to 2.5.31 pushes "Networking options" and
"Network device support" together for all architectures
that have them.

They shouldn't be split apart by Telephony, I2O,
Fusion, etc.

arch/alpha/config.in

@@ -283,10 +283,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-  source net/Config.in
-fi
-
 mainmenu_option next_comment
 comment 'ATA/ATAPI/MFM/RLL support'
 
@@ -314,6 +310,8 @@ if [ "$CONFIG_PCI" = "y" ]; then
 fi
 
 if [ "$CONFIG_NET" = "y" ]; then
+  source net/Config.in
+
   mainmenu_option next_comment
   comment 'Network device support'
 

arch/cris/config.in

@@ -135,12 +135,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-  source net/Config.in
-fi
-
-source drivers/telephony/Config.in
-
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
@@ -168,6 +162,8 @@ source drivers/ieee1394/Config.in
 source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+  source net/Config.in
+
   mainmenu_option next_comment
   comment 'Network device support'
 
@@ -187,6 +183,8 @@ source net/irda/Config.in
 
 source drivers/isdn/Config.in
 
+source drivers/telephony/Config.in
+
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'
 

arch/i386/config.in

@@ -332,12 +332,6 @@ endmenu
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
-source drivers/telephony/Config.in
-
 source drivers/message/fusion/Config.in
 
 source drivers/ieee1394/Config.in
@@ -345,6 +339,8 @@ source drivers/ieee1394/Config.in
 source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 
@@ -364,6 +360,8 @@ source net/irda/Config.in
 
 source drivers/isdn/Config.in
 
+source drivers/telephony/Config.in
+
 #
 # input before char - char/joystick depends on it. As does USB.
 #

arch/ia64/config.in

@@ -118,10 +118,6 @@ fi # !HP_SIM
 
 endmenu
 
-if [ "$CONFIG_NET" = "y" ]; then
-  source net/Config.in
-fi
-
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
   source drivers/mtd/Config.in
   source drivers/pnp/Config.in
@@ -154,6 +150,10 @@ if [ "$CONFIG_SCSI" != "n" ]; then
 fi
 endmenu
 
+if [ "$CONFIG_NET" = "y" ]; then
+  source net/Config.in
+fi
+
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
   if [ "$CONFIG_NET" = "y" ]; then
     mainmenu_option next_comment

arch/m68k/config.in

@@ -152,10 +152,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
 if [ "$CONFIG_MAC" = "y" ]; then
    source drivers/input/Config.in
 fi
@@ -271,6 +267,7 @@ fi
 endmenu
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
 
    mainmenu_option next_comment
    comment 'Network device support'

arch/mips/config.in

@@ -334,12 +334,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
-source drivers/telephony/Config.in
-
 if [ "$CONFIG_SGI_IP22" != "y" -a \
      "$CONFIG_DECSTATION" != "y" ]; then
 
@@ -372,6 +366,8 @@ if [ "$CONFIG_DECSTATION" != "y" -a \
 fi
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 
@@ -391,6 +387,8 @@ source net/irda/Config.in
 
 source drivers/isdn/Config.in
 
+source drivers/telephony/Config.in
+
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'
 

arch/mips64/config.in

@@ -132,12 +132,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
-source drivers/telephony/Config.in
-
 mainmenu_option next_comment
 comment 'ATA/ATAPI/MFM/RLL support'
 
@@ -163,6 +157,8 @@ endmenu
 #source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 
@@ -182,6 +178,8 @@ source net/irda/Config.in
 
 source drivers/isdn/Config.in
 
+source drivers/telephony/Config.in
+
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'
 

arch/parisc/config.in

@@ -99,10 +99,6 @@ endmenu
 
 source drivers/block/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-  source net/Config.in
-fi
-
 mainmenu_option next_comment
 comment 'SCSI support'
 
@@ -149,6 +145,8 @@ fi
 endmenu
 
 if [ "$CONFIG_NET" = "y" ]; then
+  source net/Config.in
+
   mainmenu_option next_comment
   comment 'Network device support'
 

arch/ppc/config.in

@@ -419,10 +419,6 @@ source drivers/pnp/Config.in
 source drivers/block/Config.in
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
@@ -449,6 +445,8 @@ source drivers/ieee1394/Config.in
 source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 

arch/ppc64/config.in

@@ -87,10 +87,6 @@ source drivers/pnp/Config.in
 source drivers/block/Config.in
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
 mainmenu_option next_comment
 comment 'ATA/ATAPI/MFM/RLL support'
 
@@ -118,6 +114,8 @@ source drivers/ieee1394/Config.in
 source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 

arch/sh/config.in

@@ -207,10 +207,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
 mainmenu_option next_comment
 comment 'ATA/ATAPI/MFM/RLL support'
 
@@ -236,6 +232,8 @@ endmenu
 source drivers/ieee1394/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 

arch/sparc/config.in

@@ -87,10 +87,6 @@ dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK
 
 endmenu
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
 # Don't frighten a common SBus user
 if [ "$CONFIG_PCI" = "y" ]; then
 
@@ -158,6 +154,8 @@ endmenu
 source drivers/fc4/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 

arch/sparc64/config.in

@@ -95,10 +95,6 @@ dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK
 
 endmenu
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
 mainmenu_option next_comment
 comment 'ATA/ATAPI/MFM/RLL device support'
 
@@ -207,6 +203,8 @@ fi
 source drivers/ieee1394/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 

arch/x86_64/config.in

@@ -119,12 +119,6 @@ source drivers/block/Config.in
 
 source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-   source net/Config.in
-fi
-
-source drivers/telephony/Config.in
-
 mainmenu_option next_comment
 comment 'ATA/ATAPI/MFM/RLL support'
 
@@ -155,6 +149,8 @@ source drivers/ieee1394/Config.in
 #source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
+   source net/Config.in
+
    mainmenu_option next_comment
    comment 'Network device support'
 
@@ -175,6 +171,8 @@ source net/irda/Config.in
 
 source drivers/isdn/Config.in
 
+source drivers/telephony/Config.in
+
 # no support for non IDE/SCSI cdroms as they were all ISA only
 
 #