Merge branch 'misc' into for-linus

[karo-tx-linux.git] / arch / arm / mach-mmp / mmp2.c

diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index d94d114eef7b3e9c92361f7be7e008d9649dd9b1..c7592f168bbdcc1e51b9de81afe7ff791bd49466 100644 (file)
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -164,7 +164,7 @@ struct resource mmp2_resource_gpio[] = {
 };
 
 struct platform_device mmp2_device_gpio = {
-       .name           = "pxa-gpio",
+       .name           = "mmp2-gpio",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(mmp2_resource_gpio),
        .resource       = mmp2_resource_gpio,