diff --git a/[refs] b/[refs] index d2a24b8d0960..575589024c7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc0a5a587dece540b84f3a862f58118dedc847ab +refs/heads/master: 1acd3de54e242834a385810bc3f0fd44211e494e diff --git a/trunk/arch/arm/mach-shmobile/board-g4evm.c b/trunk/arch/arm/mach-shmobile/board-g4evm.c index c87a7b7c5832..8e3c5559f27f 100644 --- a/trunk/arch/arm/mach-shmobile/board-g4evm.c +++ b/trunk/arch/arm/mach-shmobile/board-g4evm.c @@ -205,7 +205,7 @@ static struct resource sdhi0_resources[] = { [0] = { .name = "SDHI0", .start = 0xe6d50000, - .end = 0xe6d50nff, + .end = 0xe6d500ff, .flags = IORESOURCE_MEM, }, [1] = {