Commit c13eb152 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller

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

parent 0123d4ef
...@@ -654,8 +654,6 @@ source "drivers/ieee1394/Kconfig" ...@@ -654,8 +654,6 @@ source "drivers/ieee1394/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/cdrom/Kconfig" source "drivers/cdrom/Kconfig"
...@@ -675,8 +673,6 @@ source "sound/Kconfig" ...@@ -675,8 +673,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
source "arch/alpha/oprofile/Kconfig" source "arch/alpha/oprofile/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -612,11 +612,6 @@ source "drivers/acorn/block/Kconfig" ...@@ -612,11 +612,6 @@ source "drivers/acorn/block/Kconfig"
source "net/Kconfig" source "net/Kconfig"
# source net/ax25/Config.in
source "net/irda/Kconfig"
source "net/ax25/Kconfig"
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig" source "drivers/scsi/Kconfig"
......
...@@ -203,8 +203,6 @@ source "drivers/md/Kconfig" ...@@ -203,8 +203,6 @@ source "drivers/md/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/irda/Kconfig"
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig" source "drivers/scsi/Kconfig"
...@@ -239,9 +237,6 @@ source "drivers/misc/Kconfig" ...@@ -239,9 +237,6 @@ source "drivers/misc/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
# RMK wants arm kernels compiled with frame pointers so hardwire this to y. # RMK wants arm kernels compiled with frame pointers so hardwire this to y.
......
...@@ -178,10 +178,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -178,10 +178,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
......
...@@ -191,10 +191,6 @@ source "drivers/ide/Kconfig" ...@@ -191,10 +191,6 @@ source "drivers/ide/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -352,8 +348,6 @@ source "fs/Kconfig" ...@@ -352,8 +348,6 @@ source "fs/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -1144,10 +1144,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -1144,10 +1144,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -1170,8 +1166,6 @@ source "sound/Kconfig" ...@@ -1170,8 +1166,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
source "arch/i386/oprofile/Kconfig" source "arch/i386/oprofile/Kconfig"
......
...@@ -524,8 +524,6 @@ source "net/Kconfig" ...@@ -524,8 +524,6 @@ source "net/Kconfig"
if !IA64_HP_SIM if !IA64_HP_SIM
source "net/ax25/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/cdrom/Kconfig" source "drivers/cdrom/Kconfig"
...@@ -573,9 +571,6 @@ source "sound/Kconfig" ...@@ -573,9 +571,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
endif endif
source "lib/Kconfig" source "lib/Kconfig"
......
...@@ -530,10 +530,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -530,10 +530,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -556,8 +552,6 @@ source "sound/Kconfig" ...@@ -556,8 +552,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -1228,10 +1228,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -1228,10 +1228,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -1288,8 +1284,6 @@ endmenu ...@@ -1288,8 +1284,6 @@ endmenu
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -190,12 +190,6 @@ source drivers/message/fusion/Kconfig ...@@ -190,12 +190,6 @@ source drivers/message/fusion/Kconfig
#source drivers/message/i2o/Kconfig #source drivers/message/i2o/Kconfig
source "net/Kconfig"
#source "net/ax25/Kconfig"
source "net/irda/Kconfig"
#source "drivers/isdn/Kconfig" #source "drivers/isdn/Kconfig"
#source "drivers/telephony/Kconfig" #source "drivers/telephony/Kconfig"
...@@ -217,8 +211,6 @@ source "sound/Kconfig" ...@@ -217,8 +211,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
source "arch/parisc/oprofile/Kconfig" source "arch/parisc/oprofile/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -1133,10 +1133,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -1133,10 +1133,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
...@@ -1314,8 +1310,6 @@ endmenu ...@@ -1314,8 +1310,6 @@ endmenu
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
source "lib/Kconfig" source "lib/Kconfig"
......
...@@ -252,10 +252,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -252,10 +252,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -277,8 +273,6 @@ source "sound/Kconfig" ...@@ -277,8 +273,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "iSeries device drivers" menu "iSeries device drivers"
depends on PPC_ISERIES depends on PPC_ISERIES
......
...@@ -753,10 +753,6 @@ source "drivers/ieee1394/Kconfig" ...@@ -753,10 +753,6 @@ source "drivers/ieee1394/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -1140,8 +1136,6 @@ source "sound/Kconfig" ...@@ -1140,8 +1136,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -448,8 +448,6 @@ source "drivers/fc4/Kconfig" ...@@ -448,8 +448,6 @@ source "drivers/fc4/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
# This one must be before the filesystem configs. -DaveM # This one must be before the filesystem configs. -DaveM
menu "Unix98 PTY support" menu "Unix98 PTY support"
...@@ -506,9 +504,6 @@ source "sound/Kconfig" ...@@ -506,9 +504,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Watchdog" menu "Watchdog"
config SOFT_WATCHDOG config SOFT_WATCHDOG
......
...@@ -628,10 +628,6 @@ source "drivers/ieee1394/Kconfig" ...@@ -628,10 +628,6 @@ source "drivers/ieee1394/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig" source "drivers/telephony/Kconfig"
...@@ -735,8 +731,6 @@ source "sound/Kconfig" ...@@ -735,8 +731,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Watchdog" menu "Watchdog"
......
...@@ -301,10 +301,6 @@ source "drivers/message/i2o/Kconfig" ...@@ -301,10 +301,6 @@ source "drivers/message/i2o/Kconfig"
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
#source "drivers/telephony/Kconfig" #source "drivers/telephony/Kconfig"
...@@ -327,8 +323,6 @@ source "sound/Kconfig" ...@@ -327,8 +323,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -411,10 +411,6 @@ source "drivers/ieee1394/Kconfig" ...@@ -411,10 +411,6 @@ source "drivers/ieee1394/Kconfig"
#source drivers/message/i2o/Config.in #source drivers/message/i2o/Config.in
source "net/Kconfig" source "net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
# no support for non IDE/SCSI cdroms as they were all ISA only # no support for non IDE/SCSI cdroms as they were all ISA only
...@@ -437,8 +433,6 @@ source "sound/Kconfig" ...@@ -437,8 +433,6 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "net/bluetooth/Kconfig"
source "arch/x86_64/oprofile/Kconfig" source "arch/x86_64/oprofile/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
......
...@@ -664,4 +664,10 @@ endmenu ...@@ -664,4 +664,10 @@ endmenu
source "drivers/net/Kconfig" source "drivers/net/Kconfig"
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
source "net/bluetooth/Kconfig"
endmenu endmenu
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment