Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[pandora-kernel.git] / arch / arm / mach-shmobile / board-g4evm.c

diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c
index dee3e92..c87a7b7 100644 (file)
--- a/arch/arm/mach-shmobile/board-g4evm.c
+++ b/arch/arm/mach-shmobile/board-g4evm.c
@@ -31,7 +31,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/mmc/host.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/gpio.h>
 #include <mach/sh7377.h>
 #include <mach/common.h>
@@ -205,7 +205,7 @@ static struct resource sdhi0_resources[] = {
        [0] = {
                .name   = "SDHI0",
                .start  = 0xe6d50000,
-               .end    = 0xe6d501ff,
+               .end    = 0xe6d50nff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -232,7 +232,7 @@ static struct resource sdhi1_resources[] = {
        [0] = {
                .name   = "SDHI1",
                .start  = 0xe6d60000,
-               .end    = 0xe6d601ff,
+               .end    = 0xe6d600ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {