[kernel] update to 2.6.26.3 and 2.6.25.16

[openwrt.git] / target / linux / adm5120 / router_be / config-2.6.26

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index 8636a9a55f60a9984e9b0faef60c5ce46990e5ff..0c05b3de20c86d79cfaff164ab750e60cadc1a4a 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.26
+++ b/target/linux/adm5120/router_be/config-2.6.26
@@ -1,7 +1,16 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_ADM5120_CPU_OVERRIDES=y
+CONFIG_ADM5120=y
+CONFIG_ADM5120_ENET=y
+CONFIG_ADM5120_MACH_P_334WT=y
+CONFIG_ADM5120_MACH_P_335=y
+# CONFIG_ADM5120_OEM_CELLVISION is not set
+# CONFIG_ADM5120_OEM_COMPEX is not set
+# CONFIG_ADM5120_OEM_EDIMAX is not set
+# CONFIG_ADM5120_OEM_INFINEON is not set
+# CONFIG_ADM5120_OEM_MIKROTIK is not set
+CONFIG_ADM5120_OEM_ZYXEL=y
+CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -53,9 +62,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
@@ -105,7 +111,6 @@ CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_IPV6_MIP6=m
-# CONFIG_IPV6_MROUTE is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
@@ -114,9 +119,6 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IRQ_CPU=y
 # CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_JOLIET is not set
-CONFIG_LEDS_ADM5120=m
-# CONFIG_LEDS_ADM5120_DIAG is not set
-# CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
@@ -130,12 +132,9 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEMSTICK is not set
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
 CONFIG_MIPS=y
-CONFIG_MIPS_ADM5120=y
-CONFIG_MIPS_ADM5120_ENET=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -206,7 +205,6 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PCI=y
 # CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_ADM5120=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCSPKR_PLATFORM is not set
@@ -244,8 +242,6 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
-CONFIG_SLABINFO=y
-# CONFIG_SND_AW2 is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -267,28 +263,18 @@ CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB=m
-# CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_ADM5120_HCD=m
-# CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_HSO=m
 # CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_WDM is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_XFS_DEBUG is not set
 CONFIG_ZONE_DMA_FLAG=0