Resync kernel config, put back yellow led registration (#2607)
SVN-Revision: 9458
This commit is contained in:
parent
b314ffdd3a
commit
734ace1804
2 changed files with 8 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue