mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-27 03:47:43 +00:00
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
This commit is contained in:
commit
d7460f4a3d
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user