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

arch/arm/mach-shmobile/board-mackerel.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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 = {