Skip to contentSkip to conversation

net Kconfig consolidation

PATCH In review Christoph Hellwig 2 participants 2 messages Sep 25, 2003 – Sep 26, 2003

Subsystems (8)
Networking Network drivers Arm (32-bit) MIPS +4 more subsystems
lore
Share & tools
lore

Christoph Hellwig

author
#0 lore raw

PATCH 1/1 net Kconfig consolidation

include net/ax25/Kconfig, net/irda/Kconfig and net/bluetooth/Kconfig from net/Kconfig like all the other Kconfig files under net/. This makes the per-arch Kconfig files quite a bit smaller and also makes sure the option are available on all arches.

arch/alpha/Kconfig +0 -4
@@ -654,8 +654,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/cdrom/Kconfig"

@@ -674,8 +672,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 source "arch/alpha/oprofile/Kconfig"

===== arch/arm/Kconfig 1.35 vs edited =====

arch/arm/Kconfig +0 -5
@@ -629,11 +629,6 @@
 
 source "net/Kconfig"
 
-#   source net/ax25/Config.in
-source "net/irda/Kconfig"
-
-source "net/ax25/Kconfig"
-
 source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
arch/arm26/Kconfig +0 -5
@@ -203,8 +203,6 @@
 
 source "net/Kconfig"
 
-source "net/irda/Kconfig"
-
 source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"

@@ -238,9 +236,6 @@
 source "drivers/misc/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
-
 
 menu "Kernel hacking"
arch/cris/Kconfig +0 -4
@@ -178,10 +178,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
arch/h8300/Kconfig +0 -6
@@ -191,10 +191,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -351,8 +347,6 @@
 source "fs/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "Kernel hacking"
arch/i386/Kconfig +0 -6
@@ -1201,10 +1201,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -1226,8 +1222,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 source "arch/i386/oprofile/Kconfig"
arch/ia64/Kconfig +0 -5
@@ -527,8 +527,6 @@
 
 if !IA64_HP_SIM
 
-source "net/ax25/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/cdrom/Kconfig"

@@ -575,9 +573,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-
-source "net/bluetooth/Kconfig"
 
 endif
arch/m68knommu/Kconfig +0 -6
@@ -530,10 +530,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -555,8 +551,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "Kernel hacking"
arch/mips/Kconfig +0 -6
@@ -1228,10 +1228,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -1289,8 +1285,6 @@
 endmenu
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "Kernel hacking"
arch/parisc/Kconfig +0 -8
@@ -190,12 +190,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"

@@ -216,8 +210,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 source "arch/parisc/oprofile/Kconfig"
arch/ppc/Kconfig +0 -6
@@ -1142,10 +1142,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/video/Kconfig"

@@ -1322,8 +1318,6 @@
 endmenu
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 source "lib/Kconfig"
arch/ppc64/Kconfig +0 -6
@@ -263,10 +263,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -287,8 +283,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "iSeries device drivers"

===== arch/sh/Kconfig 1.18 vs edited =====

arch/sh/Kconfig +0 -6
@@ -753,10 +753,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -1148,8 +1144,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "Kernel hacking"

===== arch/sparc/Kconfig 1.20 vs edited =====

arch/sparc/Kconfig +0 -5
@@ -464,8 +464,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
 # This one must be before the filesystem configs. -DaveM
 
 menu "Unix98 PTY support"

@@ -521,9 +519,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
-
 
 menu "Watchdog"
arch/sparc64/Kconfig +0 -6
@@ -666,10 +666,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"

@@ -772,8 +768,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "Watchdog"

===== arch/v850/Kconfig 1.18 vs edited =====

arch/v850/Kconfig +0 -6
@@ -301,10 +301,6 @@
 
 source "net/Kconfig"
 
-source "net/ax25/Kconfig"
-
-source "net/irda/Kconfig"
-
 source "drivers/isdn/Kconfig"
 
 #source "drivers/telephony/Kconfig"

@@ -326,8 +322,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 
 menu "Kernel hacking"

===== arch/x86_64/Kconfig 1.30 vs edited =====

arch/x86_64/Kconfig +0 -6
@@ -419,10 +419,6 @@
 #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

@@ -444,8 +440,6 @@
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
-
-source "net/bluetooth/Kconfig"
 
 source "arch/x86_64/oprofile/Kconfig"
net/Kconfig +6 -0
@@ -689,4 +689,10 @@
 
 source "drivers/net/Kconfig"
 
+source "net/ax25/Kconfig"
+
+source "net/irda/Kconfig"
+
+source "net/bluetooth/Kconfig"
+
 endmenu
#1 lore raw
Quoted 4 lines · On Thu, 25 Sep 2003 13:57:17 +0200 Christoph Hellwig <[email protected]> wrote:

include net/ax25/Kconfig, net/irda/Kconfig and net/bluetooth/Kconfig from net/Kconfig like all the other Kconfig files under net/. This makes the per-arch Kconfig files quite a bit smaller and also makes sure the option are available on all arches.

Looks great, applied.

Thanks.