Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c2416 / s3c2416.c

diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c
index 35dabccd0ac232afbf101306ea3768cdb428b86c..bc30245e133b0b5b31b4ff213f1d8953be17a881 100644 (file)
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@ -55,6 +55,7 @@
 #include <plat/cpu.h>
 
 #include <plat/iic-core.h>
+#include <plat/fb-core.h>
 
 static struct map_desc s3c2416_iodesc[] __initdata = {
        IODESC_ENT(WATCHDOG),
@@ -90,7 +91,7 @@ int __init s3c2416_init(void)
        s3c_i2c0_setname("s3c2440-i2c");
        s3c_i2c1_setname("s3c2440-i2c");
 
-       s3c_device_fb.name = "s3c2443-fb";
+       s3c_fb_setname("s3c2443-fb");
 
        return sysdev_register(&s3c2416_sysdev);
 }