Fix this nasty patch which prevented others from applying

[openwrt.git] / target / linux / atheros / config-2.6.26

diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26
index 0747fe9..1ad539e 100644 (file)
--- a/target/linux/atheros/config-2.6.26
+++ b/target/linux/atheros/config-2.6.26
@@ -11,6 +11,7 @@ CONFIG_ATHEROS=y
 CONFIG_ATHEROS_AR5312=y
 CONFIG_ATHEROS_AR5315=y
 CONFIG_ATHEROS_AR5315_PCI=y
+CONFIG_ATHEROS_WDT=y
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
@@ -50,9 +51,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CSRC_R4K=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -97,14 +95,11 @@ CONFIG_IRQ_CPU=y
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEMOTE_FULONG is not set
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MDIO_BITBANG is not set
-# CONFIG_MEDIA_ATTACH is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
@@ -151,6 +146,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_MYLOADER_PARTS=y
 # CONFIG_MTD_ONENAND is not set
 # CONFIG_MTD_OTP is not set
 CONFIG_MTD_PARTITIONS=y
@@ -211,7 +207,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
-CONFIG_SLABINFO=y
 # CONFIG_SMSC_PHY is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
@@ -231,15 +226,12 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m
 # CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_ISIGHTFW is not set
 CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 CONFIG_USB_WDM=m
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_ALLOW_V4L1=y
 CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_ZONE_DMA_FLAG=0
-CONFIG_ATHEROS_WDT=y