From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 17 Nov 2008 19:46:37 +0000 (+0000)
Subject: sync 2.6.26 config
X-Git-Tag: reboot~25234
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eaee44586b2132bce5570800ce2084e91b0c90ae;p=openwrt%2Fstaging%2Fjogo.git

sync 2.6.26 config

SVN-Revision: 13268
---

diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26
index 79f0784e2c..a1ac8b11ca 100644
--- 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
@@ -94,8 +95,6 @@ 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
@@ -207,7 +206,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
@@ -227,15 +225,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_MEDIA=m
-CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_ZONE_DMA_FLAG=0
-CONFIG_ATHEROS_WDT=y