Partially fix commit r16660

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

diff --git a/target/linux/x86/config-2.6.29 b/target/linux/x86/config-2.6.29
index 3ea6898..756acfc 100644 (file)
--- a/target/linux/x86/config-2.6.29
+++ b/target/linux/x86/config-2.6.29
@@ -50,7 +50,6 @@ CONFIG_BLK_DEV_VIA82CXXX=y
 CONFIG_BOUNCE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 # CONFIG_CMDLINE_BOOL is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU5_WDT is not set
@@ -75,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_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_DCB is not set
@@ -86,8 +81,6 @@ CONFIG_CPU_SUP_UMC_32=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
@@ -116,7 +109,6 @@ CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_FREEZER is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -288,7 +280,6 @@ CONFIG_NAMESPACES=y
 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_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
@@ -315,7 +306,6 @@ CONFIG_PCSPKR_PLATFORM=y
 # 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
@@ -324,8 +314,6 @@ CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT 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
@@ -359,10 +347,8 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SPARSE_IRQ is not set
-CONFIG_SSB_POSSIBLE=y
 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