Unify VLAN_8021Q setting, needed also on r5k-cobalt.
flavours should really not start diverging in network settings. svn path=/dists/trunk/linux-2.6/; revision=10064
This commit is contained in:
parent
6abff025a8
commit
ee536318b4
|
@ -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 <maks@debian.org> Mon, 07 Jan 2008 00:49:41 +0100
|
||||
-- maximilian attems <maks@debian.org> Mon, 07 Jan 2008 11:03:41 +0100
|
||||
|
||||
linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue