diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
commit | 856f60dbd157126241cf9033514137849bb5ca22 (patch) | |
tree | fca1784ef63b89a78127a0f4d1340f90eedd6848 /arch/arm/boards/nhk8815/setup.c | |
parent | ec78bea331e195fff267ae949cee4777ef1add56 (diff) | |
parent | f4ca20c4d27751ee749f382cfd4949d825534fce (diff) | |
download | barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.gz barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.xz |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/nhk8815/setup.c')
-rw-r--r-- | arch/arm/boards/nhk8815/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c index 7f93ecb196..0c85b25c71 100644 --- a/arch/arm/boards/nhk8815/setup.c +++ b/arch/arm/boards/nhk8815/setup.c @@ -50,14 +50,17 @@ static struct nomadik_nand_platform_data nhk8815_nand_data = { static struct resource nhk8815_nand_resources[] = { { + .name = "nand_addr", .start = NAND_IO_ADDR, .end = NAND_IO_ADDR + 0xfff, .flags = IORESOURCE_MEM, }, { + .name = "nand_cmd", .start = NAND_IO_CMD, .end = NAND_IO_CMD + 0xfff, .flags = IORESOURCE_MEM, }, { + .name = "nand_data", .start = NAND_IO_DATA, .end = NAND_IO_DATA + 0xfff, .flags = IORESOURCE_MEM, |