backport ar7_wdt from linux-2.6-watchdog-mm

[openwrt.git] / target / linux / adm5120 / router_le / config-2.6.22

diff --git a/target/linux/adm5120/router_le/config-2.6.22 b/target/linux/adm5120/router_le/config-2.6.22
index 593d98c..a876583 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.22
+++ b/target/linux/adm5120/router_le/config-2.6.22
@@ -6,7 +6,6 @@ CONFIG_ADM5120_CPU_OVERRIDES=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARM_AMBA=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARM_AMBA=y

-# CONFIG_ATM_DRIVERS is not set

 CONFIG_BASE_SMALL=0
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BASE_SMALL=0
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m


@@ -46,7 +45,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_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set

-CONFIG_CRYPTO_SHA1=y

 # CONFIG_DDB5477 is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 # CONFIG_DDB5477 is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set


@@ -78,9 +76,6 @@ CONFIG_HZ_250=y
 # CONFIG_I2C is not set
 # CONFIG_IDE is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 # CONFIG_I2C is not set
 # CONFIG_IDE is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m

-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y


@@ -92,12 +87,6 @@ CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IRQ_CPU=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IRQ_CPU=y

-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_SUMMARY=y

 # CONFIG_JOLIET is not set
 CONFIG_LEDS_ADM5120=y
 CONFIG_LEDS_ADM5120_DIAG=y
 # CONFIG_JOLIET is not set
 CONFIG_LEDS_ADM5120=y
 CONFIG_LEDS_ADM5120_DIAG=y


@@ -134,7 +123,7 @@ CONFIG_MTD=y
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y

-CONFIG_MTD_BLOCK2MTD=y
+# CONFIG_MTD_BLOCK2MTD is not set

 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_CFI_AMDSTD=y


@@ -165,14 +154,14 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y

+# CONFIG_MTD_NAND_ADM5120 is not set

 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set

-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_NAND_RB100=y
+CONFIG_MTD_NAND_PLATFORM=y

 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y


@@ -185,12 +174,15 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set

+CONFIG_MTD_TRXSPLIT=y

 # CONFIG_NETDEV_1000 is not set
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NETDEV_1000 is not set
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set

+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_GRE=m

 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set


@@ -202,7 +194,6 @@ CONFIG_PCI_ADM5120=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PNPACPI is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set

-# CONFIG_ROMFS_FS is not set

 # CONFIG_RTC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_RTC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y


@@ -248,7 +239,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set

-CONFIG_USB=y

 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_ADM5120_HCD=m
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_ADM5120_HCD=m


@@ -257,9 +247,6 @@ CONFIG_USB_ADM5120_HCD=m
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_EHCI_HCD=m

-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set

 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_NET_GL620A is not set