Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / arch / arm / mach-s3c64xx / s3c6410.c

diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 4117003464ada5f505732d994b2292364d4be79b..31c29fdf1800404948a9e9e207454dcf337b7f7e 100644 (file)
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
@@ -41,8 +41,8 @@
 #include <plat/adc-core.h>
 #include <plat/iic-core.h>
 #include <plat/onenand-core.h>
-#include <plat/s3c6400.h>
-#include <plat/s3c6410.h>
+
+#include "common.h"
 
 void __init s3c6410_map_io(void)
 {
@@ -66,7 +66,7 @@ void __init s3c6410_init_clocks(int xtal)
 {
        printk(KERN_DEBUG "%s: initialising clocks\n", __func__);
        s3c64xx_register_clocks(xtal, S3C6410_CLKDIV0_ARM_MASK);
-       s3c6400_setup_clocks();
+       s3c64xx_setup_clocks();
 }
 
 void __init s3c6410_init_irq(void)
@@ -75,17 +75,18 @@ void __init s3c6410_init_irq(void)
        s3c64xx_init_irq(~0 & ~(1 << 7), ~0);
 }
 
-struct sysdev_class s3c6410_sysclass = {
-       .name   = "s3c6410-core",
+struct bus_type s3c6410_subsys = {
+       .name           = "s3c6410-core",
+       .dev_name       = "s3c6410-core",
 };
 
-static struct sys_device s3c6410_sysdev = {
-       .cls    = &s3c6410_sysclass,
+static struct device s3c6410_dev = {
+       .bus    = &s3c6410_subsys,
 };
 
 static int __init s3c6410_core_init(void)
 {
-       return sysdev_class_register(&s3c6410_sysclass);
+       return subsys_system_register(&s3c6410_subsys, NULL);
 }
 
 core_initcall(s3c6410_core_init);
@@ -94,5 +95,5 @@ int __init s3c6410_init(void)
 {
        printk("S3C6410: Initialising architecture\n");
 
-       return sysdev_register(&s3c6410_sysdev);
+       return device_register(&s3c6410_dev);
 }