diff options
Diffstat (limited to 'arch/arm/mach-exynos/cpu.c')
-rw-r--r-- | arch/arm/mach-exynos/cpu.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c index 90ec247f3b37..d4c41f349bcc 100644 --- a/arch/arm/mach-exynos/cpu.c +++ b/arch/arm/mach-exynos/cpu.c | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
12 | #include <linux/sysdev.h> | 12 | #include <linux/device.h> |
13 | 13 | ||
14 | #include <asm/mach/map.h> | 14 | #include <asm/mach/map.h> |
15 | #include <asm/mach/irq.h> | 15 | #include <asm/mach/irq.h> |
@@ -243,17 +243,18 @@ void __init exynos4_init_irq(void) | |||
243 | s5p_init_irq(NULL, 0); | 243 | s5p_init_irq(NULL, 0); |
244 | } | 244 | } |
245 | 245 | ||
246 | struct sysdev_class exynos4_sysclass = { | 246 | struct bus_type exynos4_subsys = { |
247 | .name = "exynos4-core", | 247 | .name = "exynos4-core", |
248 | .dev_name = "exynos4-core", | ||
248 | }; | 249 | }; |
249 | 250 | ||
250 | static struct sys_device exynos4_sysdev = { | 251 | static struct device exynos4_dev = { |
251 | .cls = &exynos4_sysclass, | 252 | .bus = &exynos4_subsys, |
252 | }; | 253 | }; |
253 | 254 | ||
254 | static int __init exynos4_core_init(void) | 255 | static int __init exynos4_core_init(void) |
255 | { | 256 | { |
256 | return sysdev_class_register(&exynos4_sysclass); | 257 | return subsys_system_register(&exynos4_subsys, NULL); |
257 | } | 258 | } |
258 | core_initcall(exynos4_core_init); | 259 | core_initcall(exynos4_core_init); |
259 | 260 | ||
@@ -294,5 +295,5 @@ int __init exynos_init(void) | |||
294 | if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412()) | 295 | if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412()) |
295 | s5p_reset_hook = exynos4_sw_reset; | 296 | s5p_reset_hook = exynos4_sw_reset; |
296 | 297 | ||
297 | return sysdev_register(&exynos4_sysdev); | 298 | return device_register(&exynos4_dev); |
298 | } | 299 | } |