Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-dove / common.c

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index f7a12586a1f5eaf9c1b0316b6efc2b914a63fa30..fe627aba6da7e5ffc90b98122b4ef53e540d1220 100644 (file)
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -770,7 +770,7 @@ static struct resource dove_sdio0_resources[] = {
 };
 
 static struct platform_device dove_sdio0 = {
-       .name           = "sdhci-mv",
+       .name           = "sdhci-dove",
        .id             = 0,
        .dev            = {
                .dma_mask               = &sdio_dmamask,
@@ -798,7 +798,7 @@ static struct resource dove_sdio1_resources[] = {
 };
 
 static struct platform_device dove_sdio1 = {
-       .name           = "sdhci-mv",
+       .name           = "sdhci-dove",
        .id             = 1,
        .dev            = {
                .dma_mask               = &sdio_dmamask,