atheros: do not alter the network vlan config if swconfig is required and missing

[openwrt.git] / target / linux / x86 / config-2.6.28

diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index 27cd41a..6283ae0 100644 (file)
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -106,7 +106,6 @@ CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y

-# CONFIG_FREEZER is not set

 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y


@@ -163,9 +162,6 @@ CONFIG_HW_RANDOM_VIA=y
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set

-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

 CONFIG_IDE=y
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_IDE_GD=y
 CONFIG_IDE=y
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_IDE_GD=y


@@ -206,7 +202,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set

-CONFIG_KMOD=y

 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set


@@ -267,7 +262,6 @@ CONFIG_NAMESPACES=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set

-# CONFIG_NF_DEFRAG_IPV4 is not set

 CONFIG_NOHIGHMEM=y
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 CONFIG_NOHIGHMEM=y
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y


@@ -292,7 +286,6 @@ CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set