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 a9dcf20..6283ae0 100644 (file)
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -74,10 +74,6 @@ CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y

-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set

 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set


@@ -110,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


@@ -167,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


@@ -210,10 +202,8 @@ 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_KTIME_SCALAR=y
 # CONFIG_LANCE is not set

-# CONFIG_LEDS_ALIX is not set

 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set


@@ -257,37 +247,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set

-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y

 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set

-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set

-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set

 # CONFIG_MTD_TS5500 is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 # CONFIG_MTD_TS5500 is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set


@@ -300,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


@@ -325,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


@@ -335,8 +295,6 @@ CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_R6040 is not set
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 # CONFIG_R6040 is not set
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y

-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set

 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set


@@ -366,13 +324,10 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_STATS is not set
 # CONFIG_SMP is not set
 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_SMP is not set
 # CONFIG_SMSC37B787_WDT is not set

-# CONFIG_SOFT_WATCHDOG is not set

 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y

-CONFIG_SSB_POSSIBLE=y

 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SYSPROF_TRACER is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SYSPROF_TRACER is not set

-CONFIG_SYSVIPC_SYSCTL=y

 # CONFIG_TELCLOCK is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 # CONFIG_TELCLOCK is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set