From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 12 Jan 2011 05:47:21 +0000 (+0900)
Subject: Merge branch 'rmobile/sdio' into rmobile-latest
X-Git-Tag: v2.6.38-rc1~233^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53582c4c508a95ece9f7c907edef9911c7eb79eb;p=karo-tx-linux.git

Merge branch 'rmobile/sdio' into rmobile-latest
---

53582c4c508a95ece9f7c907edef9911c7eb79eb
diff --cc arch/arm/mach-shmobile/board-mackerel.c
index 6601c595b1e0,b000bcdf5249..ad7e14aba164
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -743,9 -734,8 +743,9 @@@ static struct sh_mobile_sdhi_info sdhi2
  	.dma_slave_tx	= SHDMA_SLAVE_SDHI2_TX,
  	.dma_slave_rx	= SHDMA_SLAVE_SDHI2_RX,
  	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,
- 	.tmio_caps	= MMC_CAP_SD_HIGHSPEED |
+ 	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
  			  MMC_CAP_NEEDS_POLL,
 +	.get_cd		= slot_cn23_get_cd,
  };
  
  static struct resource sdhi2_resources[] = {