Merge branch 'rmobile/sdio' into rmobile-latest

diff --cc arch/arm/mach-shmobile/board-mackerel.c
index 6601c59,b000bcd..ad7e14a
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/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[] = {