From f726e5134a097c7537fa0fa25ef11d914d2d6275 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sun, 11 May 2008 22:30:28 +0000 Subject: [PATCH] topconfig: centralize SLIP settings spread over all files and conflicting decisions, just keep s390 disabling.. svn path=/dists/trunk/linux-2.6/; revision=11368 --- debian/config/alpha/config | 4 ---- debian/config/amd64/config | 4 ---- debian/config/arm/config | 7 ------- debian/config/arm/config.footbridge | 1 - debian/config/arm/config.ixp4xx | 4 ---- debian/config/arm/config.versatile | 3 --- debian/config/armel/config | 7 ------- debian/config/config | 4 ++++ debian/config/hppa/config | 4 ---- debian/config/i386/config | 4 ---- debian/config/ia64/config | 4 ---- debian/config/m68k/config | 4 ---- debian/config/mips/config.4kc-malta | 5 ----- debian/config/mips/config.5kc-malta | 5 ----- debian/config/mips/config.sb1a-bcm91480b | 4 ---- debian/config/mipsel/config.4kc-malta | 5 ----- debian/config/mipsel/config.5kc-malta | 5 ----- debian/config/mipsel/config.r5k-cobalt | 4 ---- debian/config/mipsel/config.sb1-bcm91250a | 4 ---- debian/config/mipsel/config.sb1a-bcm91480b | 4 ---- debian/config/powerpc/config | 4 ---- debian/config/sparc/config | 4 ---- 22 files changed, 4 insertions(+), 90 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 9041425fa..5ad3ff8f0 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -852,10 +852,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL_TRAP=y diff --git a/debian/config/amd64/config b/debian/config/amd64/config index e18ef52d8..9492ccdba 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -948,10 +948,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/arm/config b/debian/config/arm/config index f3475f9ca..39829ed5d 100644 --- a/debian/config/arm/config +++ b/debian/config/arm/config @@ -13,13 +13,6 @@ CONFIG_ARM=y ## # CONFIG_INPUT_FF_MEMLESS is not set -## -## file: drivers/net/Kconfig -## -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set - ## ## file: drivers/net/wireless/Kconfig ## diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 2bc2a5e6f..90d4da56a 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -717,7 +717,6 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOATM is not set -CONFIG_SLIP=m # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index a6a41aa91..a020b9636 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -506,10 +506,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index ed45582ef..d094afdfe 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -650,9 +650,6 @@ CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOATM=m CONFIG_PPPOL2TP=m -CONFIG_SLIP=m -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m # CONFIG_NETCONSOLE_DYNAMIC is not set diff --git a/debian/config/armel/config b/debian/config/armel/config index 31821a5a7..a0b41e12e 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -9,13 +9,6 @@ CONFIG_ARM=y CONFIG_AEABI=y CONFIG_OABI_COMPAT=y -## -## file: drivers/net/Kconfig -## -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set - ## ## file: drivers/net/wireless/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 0022ba7da..c85e3538e 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1005,6 +1005,10 @@ CONFIG_MLX4_DEBUG=y CONFIG_TEHUTI=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y CONFIG_PPPOL2TP=m CONFIG_NETCONSOLE_DYNAMIC=y diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 921546962..86810f53f 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -342,10 +342,6 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/i386/config b/debian/config/i386/config index 3d1a5d49e..0d35868b8 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1140,10 +1140,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/ia64/config b/debian/config/ia64/config index d1fa41733..27a886d8e 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -556,10 +556,6 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y CONFIG_NET_FC=y CONFIG_NETCONSOLE=m diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 152092610..504f8a04e 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -129,10 +129,6 @@ CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 79115c333..8edaf313c 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1135,11 +1135,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 3867b0b26..c40f8480f 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1364,11 +1364,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index a3eee12b5..c15b126a1 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -641,10 +641,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 4ab60509c..a549eeb6b 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1134,11 +1134,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 1e89b9b61..a89decd3d 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1363,11 +1363,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 9576fe9fd..2662c0cce 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -580,10 +580,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index ccd05cc6a..7871ae7f3 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -643,10 +643,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 5670cff01..27ffdffc3 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -640,10 +640,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 6443f792c..05654be4e 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -616,10 +616,6 @@ CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPPOATM=m -CONFIG_SLIP=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL_TRAP=y diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 2ed5e19e3..215c77b59 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -138,10 +138,6 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set