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

[cascardo/linux.git] / arch / arm / mach-exynos / common.c

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index b4beb7e..c59e188 100644 (file)
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -13,7 +13,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/gpio.h>
 #include <linux/sched.h>
 #include <linux/serial_core.h>
@@ -423,17 +423,18 @@ void __init exynos4_init_irq(void)
        s5p_init_irq(NULL, 0);
 }
 
-struct sysdev_class exynos4_sysclass = {
-       .name   = "exynos4-core",
+struct bus_type exynos4_subsys = {
+       .name           = "exynos4-core",
+       .dev_name       = "exynos4-core",
 };
 
-static struct sys_device exynos4_sysdev = {
-       .cls    = &exynos4_sysclass,
+static struct device exynos4_dev = {
+       .bus    = &exynos4_subsys,
 };
 
 static int __init exynos4_core_init(void)
 {
-       return sysdev_class_register(&exynos4_sysclass);
+       return subsys_system_register(&exynos4_subsys, NULL);
 }
 core_initcall(exynos4_core_init);
 
@@ -470,7 +471,7 @@ int __init exynos_init(void)
        /* set idle function */
        pm_idle = exynos_idle;
 
-       return sysdev_register(&exynos4_sysdev);
+       return device_register(&exynos4_dev);
 }
 
 /* uart registration process */