diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 23:18:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 23:18:03 -0800 |
| commit | d7460f4a3d75469deb1c6c028961da69608d02d9 (patch) | |
| tree | fa8ffc3a9ad930eb6b669e7d34061ab23a0ac6ca /arch | |
| parent | 63cd201e6559142b16dd2af8c911edd491bf6274 (diff) | |
| parent | 3042ac5731e6db441dfce85612da4aa3913dab3b (diff) | |
| download | op-kernel-dev-d7460f4a3d75469deb1c6c028961da69608d02d9.zip op-kernel-dev-d7460f4a3d75469deb1c6c028961da69608d02d9.tar.gz | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index bf2bcb9..3f56e70 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -950,7 +950,11 @@ static struct resource nand_flash_resources[] = { .start = 0xe6a30000, .end = 0xe6a3009b, .flags = IORESOURCE_MEM, - } + }, + [1] = { + .start = evt2irq(0x0d80), /* flstei: status error irq */ + .flags = IORESOURCE_IRQ, + }, }; static struct sh_flctl_platform_data nand_flash_data = { |
