summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcmring/arch.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-05 00:33:22 +0100
committerDavid S. Miller <davem@davemloft.net>2010-01-05 00:33:22 +0100
commit5958eed76ccc8c361f872829bdc4b8c6dc9cd379 (patch)
tree8f8dfcced082db674b0ae3ca3af9fdb6dde59dae /arch/arm/mach-bcmring/arch.c
parentbbc_envctrl: Clean up properly if kthread_run() fails. (diff)
parentMerge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux (diff)
downloadlinux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.xz
linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-bcmring/arch.c')
-rw-r--r--arch/arm/mach-bcmring/arch.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index fbe6fa02c882..53dd2a9eecf9 100644
--- 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 = {