diff options
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index c8acfec98695..03a7ffe729d5 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
14 | #include <linux/input/sh_keysc.h> | 14 | #include <linux/input/sh_keysc.h> |
15 | #include <linux/mfd/sh_mobile_sdhi.h> | 15 | #include <linux/mfd/sh_mobile_sdhi.h> |
16 | #include <linux/mmc/host.h> | ||
16 | #include <linux/mtd/physmap.h> | 17 | #include <linux/mtd/physmap.h> |
17 | #include <linux/mtd/nand.h> | 18 | #include <linux/mtd/nand.h> |
18 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
@@ -410,6 +411,7 @@ static struct resource sdhi_cn9_resources[] = { | |||
410 | static struct sh_mobile_sdhi_info sh7724_sdhi_data = { | 411 | static struct sh_mobile_sdhi_info sh7724_sdhi_data = { |
411 | .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, | 412 | .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, |
412 | .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, | 413 | .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, |
414 | .tmio_caps = MMC_CAP_SDIO_IRQ, | ||
413 | }; | 415 | }; |
414 | 416 | ||
415 | static struct platform_device sdhi_cn9_device = { | 417 | static struct platform_device sdhi_cn9_device = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index d551ed8dea95..a164f8924258 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -699,7 +699,7 @@ static struct intc_mask_reg mask_registers[] __initdata = { | |||
699 | { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI, | 699 | { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI, |
700 | FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } }, | 700 | FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } }, |
701 | { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */ | 701 | { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */ |
702 | { DISABLED, DISABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, | 702 | { DISABLED, ENABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, |
703 | { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ | 703 | { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ |
704 | { 0, 0, 0, CMT, 0, USB_USBI1, USB_USBI0, } }, | 704 | { 0, 0, 0, CMT, 0, USB_USBI1, USB_USBI0, } }, |
705 | { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */ | 705 | { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */ |