Commit d7460f4a authored by Olof Johansson's avatar Olof Johansson

Merge branch 'boards3' of...

Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2

From Simon Horman:
* 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: mackerel: Add FLCTL IRQ resource
parents 63cd201e 3042ac57
...@@ -950,7 +950,11 @@ static struct resource nand_flash_resources[] = { ...@@ -950,7 +950,11 @@ static struct resource nand_flash_resources[] = {
.start = 0xe6a30000, .start = 0xe6a30000,
.end = 0xe6a3009b, .end = 0xe6a3009b,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
} },
[1] = {
.start = evt2irq(0x0d80), /* flstei: status error irq */
.flags = IORESOURCE_IRQ,
},
}; };
static struct sh_flctl_platform_data nand_flash_data = { static struct sh_flctl_platform_data nand_flash_data = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment