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

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

diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index b7555a0fb0fb2b02b1fc692bfe88b1da9423e9b3..28d0b918cd4b6cf911afac7bb836e9c8260658df 100644 (file)
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -17,7 +17,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>
@@ -257,17 +257,18 @@ void __init s5p6450_init_irq(void)
        s5p_init_irq(vic, ARRAY_SIZE(vic));
 }
 
-struct sysdev_class s5p64x0_sysclass = {
-       .name   = "s5p64x0-core",
+struct bus_type s5p64x0_subsys = {
+       .name           = "s5p64x0-core",
+       .dev_name       = "s5p64x0-core",
 };
 
-static struct sys_device s5p64x0_sysdev = {
-       .cls    = &s5p64x0_sysclass,
+static struct device s5p64x0_dev = {
+       .bus    = &s5p64x0_subsys,
 };
 
 static int __init s5p64x0_core_init(void)
 {
-       return sysdev_class_register(&s5p64x0_sysclass);
+       return subsys_system_register(&s5p64x0_subsys, NULL);
 }
 core_initcall(s5p64x0_core_init);
 
@@ -278,7 +279,7 @@ int __init s5p64x0_init(void)
        /* set idle function */
        pm_idle = s5p64x0_idle;
 
-       return sysdev_register(&s5p64x0_sysdev);
+       return device_register(&s5p64x0_dev);
 }
 
 static struct s3c24xx_uart_clksrc s5p64x0_serial_clocks[] = {