rename generic-2.6/config-default to generic-2.6/config-2.6.21

[openwrt.git] / target / linux / rb532 / config-2.6.22

diff --git a/target/linux/rb532/config-2.6.22 b/target/linux/rb532/config-2.6.22
index bc62b77..65d7ba3 100644 (file)
--- a/target/linux/rb532/config-2.6.22
+++ b/target/linux/rb532/config-2.6.22
@@ -115,8 +115,7 @@ CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM 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_RB500=y
+CONFIG_MTD_NAND_PLATFORM=y

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


@@ -132,6 +131,8 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_NETDEV_1000 is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NETDEV_1000 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


@@ -141,6 +142,7 @@ CONFIG_PAGE_SIZE_4KB=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_RC32434_WDT=y

 # 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