Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/g…

…it/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
git-mirror · Nov 21, 2012 · d7460f4 · d7460f4
2 parents 63cd201 + 3042ac5
commit d7460f4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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 = {