Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / arch / arm / mach-s5pc100 / common.c

diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
index 73594a2fcf267ac1d8305471ccf65791b7d80f05..c9095730a7f58ec31f4cf34ee3863f32a848dd6a 100644 (file)
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@ -20,7 +20,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>
 #include <linux/sched.h>
@@ -192,17 +192,18 @@ void __init s5pc100_init_irq(void)
        s5p_init_irq(vic, ARRAY_SIZE(vic));
 }
 
-static struct sysdev_class s5pc100_sysclass = {
-       .name   = "s5pc100-core",
+static struct bus_type s5pc100_subsys = {
+       .name           = "s5pc100-core",
+       .dev_name       = "s5pc100-core",
 };
 
-static struct sys_device s5pc100_sysdev = {
-       .cls    = &s5pc100_sysclass,
+static struct device s5pc100_dev = {
+       .bus    = &s5pc100_subsys,
 };
 
 static int __init s5pc100_core_init(void)
 {
-       return sysdev_class_register(&s5pc100_sysclass);
+       return subsys_system_register(&s5pc100_subsys, NULL);
 }
 core_initcall(s5pc100_core_init);
 
@@ -213,7 +214,7 @@ int __init s5pc100_init(void)
        /* set idle function */
        pm_idle = s5pc100_idle;
 
-       return sysdev_register(&s5pc100_sysdev);
+       return device_register(&s5pc100_dev);
 }
 
 /* uart registration process */