Resync kernel config, put back yellow led registration (#2607)

SVN-Revision: 9458

diff --git a/target/linux/rb532/config-2.6.22 b/target/linux/rb532/config-2.6.22
index d8d2de3e2c8df89cc176626af800ac83de7cd963..e6805dd7287c5bebe97a3767556b06d5595f8098 100644 (file)
--- a/target/linux/rb532/config-2.6.22
+++ b/target/linux/rb532/config-2.6.22
@@ -116,7 +116,6 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 CONFIG_MTD_NAND_PLATFORM=y
-# CONFIG_MTD_NAND_RB500 is not set
 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_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

diff --git a/target/linux/rb532/files/arch/mips/rb500/devices.c b/target/linux/rb532/files/arch/mips/rb500/devices.c
index d2476a89c39d8e9d6d8d2ac117153a479c7931b8..dec2be9b2ba9301680b02351b3da5657547484fb 100644 (file)
--- a/target/linux/rb532/files/arch/mips/rb500/devices.c
+++ b/target/linux/rb532/files/arch/mips/rb500/devices.c
@@ -184,11 +184,16 @@ static struct mtd_partition rb500_partition_info[] = {
        }
 };
 
+static struct platform_device rb500_led = {
+       .name = "rb500-led",
+       .id = 0,
+};
 
 static struct platform_device *rb500_devs[] = {
        &korina_dev0,
        &nand_slot0,
-       &cf_slot0
+       &cf_slot0,
+       &rb500_led
 };
 
 static void __init parse_mac_addr(char *macstr)