From d1c7926da88b581b4e32ac9161898d717a1ead4a Mon Sep 17 00:00:00 2001
From: Arnd Hannemann <arnd@arndnet.de>
Date: Tue, 28 Dec 2010 22:22:35 +0000
Subject: [PATCH] --- yaml --- r: 230527 b: refs/heads/master c:
 464495e5d8ba58ce6c103a2a176abaf313c0c704 h: refs/heads/master i:   230525:
 bdb87d98497a7657a744c32ef73f9676fa4e1a93   230523:
 407a5929005da9f24d5c57c44b2876e3a68ac369   230519:
 160b3dce01d76537688de56c97d2f36a565b5c47   230511:
 bdcbb77e3251dbf8a304fe6c07146b99e755fb70   230495:
 178008d7cbab612ff94cd98ab74eda5892f91c93   230463:
 d4d696779d31c4350f44b56d3940825ec314c30f   230399:
 650b1a5c5e1911740435aa05ed8d49538a3baac4 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/sh/boards/mach-migor/setup.c      | 2 ++
 trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ee10518c333e..2a3752b12d53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a68a07841848a25fa04918b441667fd192cea108
+refs/heads/master: 464495e5d8ba58ce6c103a2a176abaf313c0c704
diff --git a/trunk/arch/sh/boards/mach-migor/setup.c b/trunk/arch/sh/boards/mach-migor/setup.c
index c8acfec98695..03a7ffe729d5 100644
--- a/trunk/arch/sh/boards/mach-migor/setup.c
+++ b/trunk/arch/sh/boards/mach-migor/setup.c
@@ -13,6 +13,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/host.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/nand.h>
 #include <linux/i2c.h>
@@ -410,6 +411,7 @@ static struct resource sdhi_cn9_resources[] = {
 static struct sh_mobile_sdhi_info sh7724_sdhi_data = {
 	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,
 	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,
+	.tmio_caps      = MMC_CAP_SDIO_IRQ,
 };
 
 static struct platform_device sdhi_cn9_device = {
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index d551ed8dea95..a164f8924258 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -699,7 +699,7 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 	  { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI,
 	    FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } },
 	{ 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */
-	  { DISABLED, DISABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } },
+	  { DISABLED, ENABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } },
 	{ 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */
 	  { 0, 0, 0, CMT, 0, USB_USBI1, USB_USBI0, } },
 	{ 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */