Merge git://git.infradead.org/mtd-2.6

[net-next-2.6.git] / arch / arm / mach-bcmring / arch.c

diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index fbe6fa02c8820f71e0f3343e06b9628e68e71a5f..53dd2a9eecf9b1848d4d3514ebee97821bb7ada6 100644 (file)
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -70,9 +70,19 @@ static struct ctl_table bcmring_sysctl_reboot[] = {
        {}
 };
 
+static struct resource nand_resource[] = {
+       [0] = {
+               .start = MM_ADDR_IO_NAND,
+               .end = MM_ADDR_IO_NAND + 0x1000 - 1,
+               .flags = IORESOURCE_MEM,
+       },
+};
+
 static struct platform_device nand_device = {
        .name = "bcm-nand",
        .id = -1,
+       .resource = nand_resource,
+       .num_resources  = ARRAY_SIZE(nand_resource),
 };
 
 static struct platform_device *devices[] __initdata = {