diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 0903459e8..7b9f7e255 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -588,7 +588,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_ISDN=m CONFIG_ISDN_I4L=m diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 0883928fe..da1ef6008 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -553,7 +553,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_ISDN=m CONFIG_ISDN_I4L=m diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 40a4f090a..a948a675a 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -696,7 +696,6 @@ CONFIG_PPPOE=m # CONFIG_PPPOATM is not set CONFIG_SLIP=m # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index ad311ad86..b96b5ec98 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -765,7 +765,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index aa2d287ff..fe5ee1db5 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -783,7 +783,6 @@ CONFIG_SLIP=m CONFIG_SLHC=m CONFIG_SLIP_SMART=y # CONFIG_NET_FC is not set -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m # CONFIG_NETCONSOLE_DYNAMIC is not set CONFIG_NETPOLL=y diff --git a/debian/config/hppa/config b/debian/config/hppa/config index c8b3c0354..bbea79c45 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -355,7 +355,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_NET_FC is not set -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m # CONFIG_ISDN is not set # CONFIG_PHONE is not set diff --git a/debian/config/i386/config b/debian/config/i386/config index 211244dfb..73f3888e5 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -701,7 +701,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_VIRTIO_NET=m CONFIG_ISDN=m diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 6c3c3814a..018fb181d 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -103,7 +103,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_ISDN=m CONFIG_ISDN_CAPI=m diff --git a/debian/config/m68k/config b/debian/config/m68k/config index fc256daef..fb49d7426 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -92,7 +92,6 @@ CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m # CONFIG_ISDN is not set # CONFIG_PHONE is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index eecd3179d..c15153af9 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1330,7 +1330,6 @@ CONFIG_SLHC=m CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 66428b7f4..59d538273 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1427,7 +1427,6 @@ CONFIG_SLHC=m CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 3cdbd1d90..d59e1d200 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -760,7 +760,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 1ed644e82..003e3b70e 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -756,7 +756,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 2952dc566..47bd962cc 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1330,7 +1330,6 @@ CONFIG_SLHC=m CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 43c4c8dfa..bfd286117 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1427,7 +1427,6 @@ CONFIG_SLHC=m CONFIG_SLIP_SMART=y # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index f653ae00a..e3d30d890 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -601,7 +601,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 0617c4ed6..6486f79e2 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -760,7 +760,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 276825eea..2a1eab480 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -756,7 +756,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 2765210fe..f0c4b66a2 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -445,7 +445,6 @@ CONFIG_SLIP=m # CONFIG_SLIP_SMART is not set # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y -CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_ISDN=m # CONFIG_ISDN_I4L is not set diff --git a/debian/config/s390/config b/debian/config/s390/config index c4a4aa177..2ac130b01 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -145,7 +145,6 @@ CONFIG_LLC=y # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set -# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_ACORN_PARTITION is not set # CONFIG_OSF_PARTITION is not set diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 84553d6b8..d5cea24c6 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -292,7 +292,6 @@ CONFIG_KEYBOARD_LKKBD=m # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # CONFIG_ACORN_PARTITION is not set # CONFIG_FB_SIS is not set -CONFIG_SHAPER=m # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_NCPFS_EXTRAS is not set CONFIG_PPP_SYNC_TTY=m