2 files changed, 1 insertions, 4 deletions

diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 856b81cf2f8a..fb77d1448fec 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -57,7 +57,7 @@ static void __init clps711x_add_syscon(void)
         unsigned i;
 
         for (i = 0; i < ARRAY_SIZE(clps711x_syscon_res); i++)
-                platform_device_register_simple("clps711x-syscon", i + 1,
+                platform_device_register_simple("syscon", i + 1,
                                                 &clps711x_syscon_res[i], 1);
 }
 
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 1a31512369f9..962a6e17a01a 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -159,9 +159,6 @@ static int syscon_probe(struct platform_device *pdev)
 
 static const struct platform_device_id syscon_ids[] = {
         { "syscon", },
-#ifdef CONFIG_ARCH_CLPS711X
-        { "clps711x-syscon", },
-#endif
         { }
 };