From 3e27582bd1c3146674581c303d5ddbe000f7451d Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Fri, 29 Mar 2013 22:05:51 +0100
Subject: [PATCH] --- yaml --- r: 373871 b: refs/heads/master c:
 757688c8b51073450b77940dcb94f33bf4c3de88 h: refs/heads/master i:   373869:
 0d96604eae103a458c65de76e9a4b9673e161afb   373867:
 f34e2291f425125d9ade0a1c8bd67e3d2b19f984   373863:
 ada3e6a112fd5a608013fd262ca116f2924927c2   373855:
 bd34fa7518c3be12af81b4b682c8f774df7d3bea v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-shmobile/board-mackerel.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a98ba5ac8741..f95231ee8eaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe0a14417bc95492621b45a3cf088ce53ee05c36
+refs/heads/master: 757688c8b51073450b77940dcb94f33bf4c3de88
diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c
index a47a11160693..b976ad682016 100644
--- a/trunk/arch/arm/mach-shmobile/board-mackerel.c
+++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c
@@ -979,12 +979,11 @@ static struct resource sdhi0_resources[] = {
 		.end	= 0xe68500ff,
 		.flags	= IORESOURCE_MEM,
 	}, {
-		.start	= evt2irq(0x0e00) /* SDHI0_SDHI0I0 */,
-		.flags	= IORESOURCE_IRQ,
-	}, {
+		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
 		.start	= evt2irq(0x0e20) /* SDHI0_SDHI0I1 */,
 		.flags	= IORESOURCE_IRQ,
 	}, {
+		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
 		.start	= evt2irq(0x0e40) /* SDHI0_SDHI0I2 */,
 		.flags	= IORESOURCE_IRQ,
 	},
@@ -1019,10 +1018,6 @@ static struct resource sdhi1_resources[] = {
 		.start	= 0xe6860000,
 		.end	= 0xe68600ff,
 		.flags	= IORESOURCE_MEM,
-	}, {
-		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
-		.start	= evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
-		.flags	= IORESOURCE_IRQ,
 	}, {
 		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
 		.start	= evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */