Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-clps711x / devices.c

diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 856b81cf2f8a59f35654e2ea73a9193678938cb3..fb77d1448fec880f115d45593e7ffd2a171883fa 100644 (file)
--- 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);
 }