diff --git a/debian/changelog b/debian/changelog index 7cb09d8e5..be206a051 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ linux-2.6 (2.6.24~rc7-1~experimental.1) UNRELEASED; urgency=low * [amd64, i386] Enable IT8712F_WDT, FB_EFI. * Add and enable at76.patch wireless driver for Atmel USB cards. * Add and enable ath5k.patch wireless driver for Atheros 5xxx cards. + * Unify VLAN_8021Q setting, needed also on r5k-cobalt. [ Bastian Blank ] * [amd64, i386]: Set kernel architecture to x86. @@ -56,7 +57,7 @@ linux-2.6 (2.6.24~rc7-1~experimental.1) UNRELEASED; urgency=low * [mips/mipsel] Remove QEMU flavour, as the Malta platform is now correctly emulated in QEMU. - -- maximilian attems Mon, 07 Jan 2008 00:49:41 +0100 + -- maximilian attems Mon, 07 Jan 2008 11:03:41 +0100 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index c9e7bf584..8abbc72ea 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -209,7 +209,6 @@ CONFIG_ATM=y # CONFIG_ATM_LANE is not set # CONFIG_ATM_BR2684 is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 6a5b32525..37ee88dc0 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -250,7 +250,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index d2d63752a..e98566fe4 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -398,7 +398,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m CONFIG_DECNET_ROUTER=y CONFIG_LLC=y diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 0b7e991f3..b4397dae8 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -433,7 +433,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set CONFIG_LLC=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index b2e1cef85..fb1d45e52 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -209,7 +209,6 @@ CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_ULOG=m # CONFIG_ATM is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 793e8c2da..75218f49a 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -62,7 +62,6 @@ CONFIG_IP_TCPDIAG=y # CONFIG_IP_TCPDIAG_IPV6 is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set CONFIG_LLC=m # CONFIG_LLC2 is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 9107ec473..8db12064d 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -554,7 +554,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 0dccfb81a..16f7f24d7 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -556,7 +556,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index dbdee3959..ba556692c 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -223,7 +223,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index e30add311..ceb05bcb0 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -387,7 +387,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index b3f36d5bc..a9c5418a7 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -383,7 +383,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index a2c87dfc4..1ace04e30 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -554,7 +554,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 7696de5b9..b9f90f2d5 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -556,7 +556,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 9dfd57462..a42daf80e 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -219,7 +219,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 4c6c45490..09b2f0f37 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -387,7 +387,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index a189033a9..ce7928f35 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -383,7 +383,6 @@ CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set