diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-10-29 10:03:14 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-10-29 10:03:14 +0000 |
| commit | 734ace1804e0a2971df8c2556875814cd9b13a26 (patch) | |
| tree | 9b5d5a0b587065f6dc43097ad5fe00467d300c89 /target/linux | |
| parent | b314ffdd3abe3babc3ab9d4caea87e2d5da3d8ef (diff) | |
| download | upstream-734ace1804e0a2971df8c2556875814cd9b13a26.tar.gz upstream-734ace1804e0a2971df8c2556875814cd9b13a26.tar.bz2 upstream-734ace1804e0a2971df8c2556875814cd9b13a26.zip | |
Resync kernel config, put back yellow led registration (#2607)
SVN-Revision: 9458
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/rb532/config-2.6.22 | 3 | ||||
| -rw-r--r-- | target/linux/rb532/files/arch/mips/rb500/devices.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/target/linux/rb532/config-2.6.22 b/target/linux/rb532/config-2.6.22 index d8d2de3e2c..e6805dd728 100644 --- 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 d2476a89c3..dec2be9b2b 100644 --- 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) |