diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/common.c')
-rw-r--r-- | arch/arm/mach-s5pv210/common.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c index a4921bc9f1d..0ec393305d7 100644 --- a/arch/arm/mach-s5pv210/common.c +++ b/arch/arm/mach-s5pv210/common.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
21 | #include <linux/sysdev.h> | 21 | #include <linux/device.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
@@ -229,17 +229,18 @@ void __init s5pv210_init_irq(void) | |||
229 | s5p_init_irq(vic, ARRAY_SIZE(vic)); | 229 | s5p_init_irq(vic, ARRAY_SIZE(vic)); |
230 | } | 230 | } |
231 | 231 | ||
232 | struct sysdev_class s5pv210_sysclass = { | 232 | struct bus_type s5pv210_subsys = { |
233 | .name = "s5pv210-core", | 233 | .name = "s5pv210-core", |
234 | .dev_name = "s5pv210-core", | ||
234 | }; | 235 | }; |
235 | 236 | ||
236 | static struct sys_device s5pv210_sysdev = { | 237 | static struct device s5pv210_dev = { |
237 | .cls = &s5pv210_sysclass, | 238 | .bus = &s5pv210_subsys, |
238 | }; | 239 | }; |
239 | 240 | ||
240 | static int __init s5pv210_core_init(void) | 241 | static int __init s5pv210_core_init(void) |
241 | { | 242 | { |
242 | return sysdev_class_register(&s5pv210_sysclass); | 243 | return subsys_system_register(&s5pv210_subsys, NULL); |
243 | } | 244 | } |
244 | core_initcall(s5pv210_core_init); | 245 | core_initcall(s5pv210_core_init); |
245 | 246 | ||
@@ -250,7 +251,7 @@ int __init s5pv210_init(void) | |||
250 | /* set idle function */ | 251 | /* set idle function */ |
251 | pm_idle = s5pv210_idle; | 252 | pm_idle = s5pv210_idle; |
252 | 253 | ||
253 | return sysdev_register(&s5pv210_sysdev); | 254 | return device_register(&s5pv210_dev); |
254 | } | 255 | } |
255 | 256 | ||
256 | static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = { | 257 | static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = { |