Merge branch 'driver-core-next' into Linux 3.2

[karo-tx-linux.git] / arch / arm / mach-exynos / cpu.c

diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c
index 90ec247f3b375f498e20f46c20e25fe2c943b54a..90a0297b77b8970c901291d9807ca04579192a9a 100644 (file)
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@ -9,7 +9,7 @@
 */
 
 #include <linux/sched.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
@@ -110,11 +110,6 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                .pfn            = __phys_to_pfn(EXYNOS4_PA_DMC0),
                .length         = SZ_4K,
                .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_SROMC,
-               .pfn            = __phys_to_pfn(EXYNOS4_PA_SROMC),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
        }, {
                .virtual        = (unsigned long)S3C_VA_USB_HSPHY,
                .pfn            = __phys_to_pfn(EXYNOS4_PA_HSPHY),
@@ -243,17 +238,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);
 
@@ -294,5 +290,5 @@ int __init exynos_init(void)
        if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412())
                s5p_reset_hook = exynos4_sw_reset;
 
-       return sysdev_register(&exynos4_sysdev);
+       return device_register(&exynos4_dev);
 }