summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/alpha/config.in6
-rw-r--r--arch/cris/config.in10
-rw-r--r--arch/i386/config.in10
-rw-r--r--arch/ia64/config.in8
-rw-r--r--arch/m68k/config.in5
-rw-r--r--arch/mips/config.in10
-rw-r--r--arch/mips64/config.in10
-rw-r--r--arch/parisc/config.in6
-rw-r--r--arch/ppc/config.in6
-rw-r--r--arch/ppc64/config.in6
-rw-r--r--arch/sh/config.in6
-rw-r--r--arch/sparc/config.in6
-rw-r--r--arch/sparc64/config.in6
-rw-r--r--arch/x86_64/config.in10
14 files changed, 39 insertions, 66 deletions
diff --git a/arch/alpha/config.in b/arch/alpha/config.in
index 7b98848f723f..8772f5a9509a 100644
--- a/arch/alpha/config.in
+++ b/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'
diff --git a/arch/cris/config.in b/arch/cris/config.in
index 749f99120660..fee3cbd8e93e 100644
--- a/arch/cris/config.in
+++ b/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)'
diff --git a/arch/i386/config.in b/arch/i386/config.in
index 45a94723913a..ef14ef970d4d 100644
--- a/arch/i386/config.in
+++ b/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.
#
diff --git a/arch/ia64/config.in b/arch/ia64/config.in
index 7a624d2b4742..b7b69cda6dc1 100644
--- a/arch/ia64/config.in
+++ b/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
diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index d3ce9e6638e9..25189494353a 100644
--- a/arch/m68k/config.in
+++ b/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'
diff --git a/arch/mips/config.in b/arch/mips/config.in
index 8579193f7f88..af96bff4a683 100644
--- a/arch/mips/config.in
+++ b/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)'
diff --git a/arch/mips64/config.in b/arch/mips64/config.in
index 877922fc21e5..3b6fd0c3f8ce 100644
--- a/arch/mips64/config.in
+++ b/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)'
diff --git a/arch/parisc/config.in b/arch/parisc/config.in
index 016628d2db6f..acead292ee4e 100644
--- a/arch/parisc/config.in
+++ b/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'
diff --git a/arch/ppc/config.in b/arch/ppc/config.in
index 386bf135f1b5..0f3d42a9c3e8 100644
--- a/arch/ppc/config.in
+++ b/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'
diff --git a/arch/ppc64/config.in b/arch/ppc64/config.in
index 20159b4a0cb0..8faa94ea5fb1 100644
--- a/arch/ppc64/config.in
+++ b/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'
diff --git a/arch/sh/config.in b/arch/sh/config.in
index f956fae61abe..d4cebd924ae9 100644
--- a/arch/sh/config.in
+++ b/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'
diff --git a/arch/sparc/config.in b/arch/sparc/config.in
index 2810a503a8e6..53eb949382ba 100644
--- a/arch/sparc/config.in
+++ b/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'
diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in
index 7ff56c408258..ea3040b2acb0 100644
--- a/arch/sparc64/config.in
+++ b/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'
diff --git a/arch/x86_64/config.in b/arch/x86_64/config.in
index beb522968c8e..65e921b8e88d 100644
--- a/arch/x86_64/config.in
+++ b/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
#