[NET]: Consolidate ax25/isdn/bluetooth Kconfig inclusion.

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 28b21380b8ead2da5542b1c987595f9a2001c9bc..9a985819b95e596414bee82047698e592e1652e7 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -654,8 +654,6 @@ source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/cdrom/Kconfig"
@@ -675,8 +673,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 source "arch/alpha/oprofile/Kconfig"
 
 menu "Kernel hacking"

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 636ef09d924ce546fa9f3a722469dbf346b2a972..679b3348ca80dd4c045cf9886ceab3a115ddeb4d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -612,11 +612,6 @@ source "drivers/acorn/block/Kconfig"
 
 source "net/Kconfig"
 
-#   source net/ax25/Config.in
-source "net/irda/Kconfig"
-
-source "net/ax25/Kconfig"
-
 source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index e05f274e0bfdd1c62778984162ff94010ac1e6b1..05a9a2e5566775f4f6cf087aa43a13cd3be7a528 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -203,8 +203,6 @@ source "drivers/md/Kconfig"
 
 source "net/Kconfig"
 
-source "net/irda/Kconfig"
-
 source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
@@ -239,9 +237,6 @@ source "drivers/misc/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
-
 menu "Kernel hacking"
 
 # RMK wants arm kernels compiled with frame pointers so hardwire this to y.

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index fb564d7dca9897b7c7209c665aaa4bb19e97b4c1..86a05dbffc5b4f17acb2a438f696d005b2e6dc5f 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -178,10 +178,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 181e65ae964fe34878ce2927fcbb783132021690..769b98b63eaf581f82cc53fd7ece5499d8883599 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -191,10 +191,6 @@ source "drivers/ide/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -352,8 +348,6 @@ source "fs/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "Kernel hacking"
 

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index c3d93c2921833453637b6219ea0123d855782cf9..9606cd12a325d0df5bec8902aa2b43514f5a5ce3 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1144,10 +1144,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -1170,8 +1166,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 source "arch/i386/oprofile/Kconfig"
 
 

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 2c432cea4f7d4b3a14614118951e7e5e760dc0f0..cd15f8b01c188d3bf2d21aadbb7951de36ee7f7d 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -524,8 +524,6 @@ source "net/Kconfig"
 
 if !IA64_HP_SIM
 
-source "net/ax25/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/cdrom/Kconfig"
@@ -573,9 +571,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-
-source "net/bluetooth/Kconfig"
-
 endif
 
 source "lib/Kconfig"

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 7a2d588d799cc6ae7860814e7ebb6f07dff7e0b1..7475df436f0088aa2f47daea09eeef734695a52c 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -530,10 +530,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -556,8 +552,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "Kernel hacking"
 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e3e60d977cd86482456ec55972babfc6d4b09d29..277ba41d5cbb0a5a4437b628f902e992b07046d4 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1228,10 +1228,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -1288,8 +1284,6 @@ endmenu
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "Kernel hacking"
 

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index d3fdab8f9e9082f7e879f6a1db83b1fe8eff0747..671488825699eb54bb9a69650cf7f7456fc264f7 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -190,12 +190,6 @@ source drivers/message/fusion/Kconfig
 
 #source drivers/message/i2o/Kconfig
 
-source "net/Kconfig"
-
-#source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 #source "drivers/isdn/Kconfig"
 
 #source "drivers/telephony/Kconfig"
@@ -217,8 +211,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 source "arch/parisc/oprofile/Kconfig"
 
 menu "Kernel hacking"

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index d06204b412289f7e92fef4bcf524563a52ed7ffe..1e950df48163cd2f7d64b8013dc7b656d0c32768 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1133,10 +1133,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/video/Kconfig"
@@ -1314,8 +1310,6 @@ endmenu
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 source "lib/Kconfig"
 
 

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 1405bf41ed014907ecb7689470811a723abf216a..ed77dfb1106af2c5fc001bad50e78dd7e0de0674 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -252,10 +252,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -277,8 +273,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "iSeries device drivers"
        depends on PPC_ISERIES

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 24b9f3f978972f533aa1c38adc7891f31e6b77f9..8cf479a4974256bb201881b29418a2a5ce40f76d 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -753,10 +753,6 @@ source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -1140,8 +1136,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "Kernel hacking"
 

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 2aa9180b242201392d0f108a5b0d0b58ee6d673e..17cecfa6dd3284e48e54fa97c8c7e4378382dd2f 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -448,8 +448,6 @@ source "drivers/fc4/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
 # This one must be before the filesystem configs. -DaveM
 
 menu "Unix98 PTY support"
@@ -506,9 +504,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
-
 menu "Watchdog"
 
 config SOFT_WATCHDOG

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index b36cbbad6807231d5f7f196895fca35bdd65cfd2..d7feea69ec03a063780c4002731ac03b23a91641 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -628,10 +628,6 @@ source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
@@ -735,8 +731,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "Watchdog"
 

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 37fe8943275dfffd577aec8bacaa7882db2464e8..18746d12e492ab9ae9abd4c06e95ac56b9752371 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -301,10 +301,6 @@ source "drivers/message/i2o/Kconfig"
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 #source "drivers/telephony/Kconfig"
@@ -327,8 +323,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 
 menu "Kernel hacking"
 

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 02f9dbd21394e2a2ac6dee8f7229190bc7cd885f..455efcb01c1ea42cb33bf5fe06cc0d60ff609779 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -411,10 +411,6 @@ source "drivers/ieee1394/Kconfig"
 #source drivers/message/i2o/Config.in
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 # no support for non IDE/SCSI cdroms as they were all ISA only
@@ -437,8 +433,6 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
-source "net/bluetooth/Kconfig"
-
 source "arch/x86_64/oprofile/Kconfig"
 
 menu "Kernel hacking"

diff --git a/net/Kconfig b/net/Kconfig
index af14dbe43112f2cb1d5a801b62bcfd60dfb2dd33..0f9c8d30c2ea0b2bee075d758fb67d3bc09d0e3d 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -664,4 +664,10 @@ endmenu
 
 source "drivers/net/Kconfig"
 
+source "net/ax25/Kconfig"
+
+source "net/irda/Kconfig"
+
+source "net/bluetooth/Kconfig"
+
 endmenu