diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/cpu.c')
-rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 84ec74633232..28e71efb388e 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/sysdev.h> | 20 | #include <linux/device.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
@@ -174,17 +174,18 @@ void __init s5pv210_init_irq(void) | |||
174 | s5p_init_irq(vic, ARRAY_SIZE(vic)); | 174 | s5p_init_irq(vic, ARRAY_SIZE(vic)); |
175 | } | 175 | } |
176 | 176 | ||
177 | struct sysdev_class s5pv210_sysclass = { | 177 | struct bus_type s5pv210_subsys = { |
178 | .name = "s5pv210-core", | 178 | .name = "s5pv210-core", |
179 | .dev_name = "s5pv210-core", | ||
179 | }; | 180 | }; |
180 | 181 | ||
181 | static struct sys_device s5pv210_sysdev = { | 182 | static struct device s5pv210_dev = { |
182 | .cls = &s5pv210_sysclass, | 183 | .bus = &s5pv210_subsys, |
183 | }; | 184 | }; |
184 | 185 | ||
185 | static int __init s5pv210_core_init(void) | 186 | static int __init s5pv210_core_init(void) |
186 | { | 187 | { |
187 | return sysdev_class_register(&s5pv210_sysclass); | 188 | return subsys_system_register(&s5pv210_subsys, NULL); |
188 | } | 189 | } |
189 | 190 | ||
190 | core_initcall(s5pv210_core_init); | 191 | core_initcall(s5pv210_core_init); |
@@ -199,5 +200,5 @@ int __init s5pv210_init(void) | |||
199 | /* set sw_reset function */ | 200 | /* set sw_reset function */ |
200 | s5p_reset_hook = s5pv210_sw_reset; | 201 | s5p_reset_hook = s5pv210_sw_reset; |
201 | 202 | ||
202 | return sysdev_register(&s5pv210_sysdev); | 203 | return device_register(&s5pv210_dev); |
203 | } | 204 | } |