diff options
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/common.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c index 73594a2fcf26..c9095730a7f5 100644 --- a/arch/arm/mach-s5pc100/common.c +++ b/arch/arm/mach-s5pc100/common.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/sysdev.h> | 23 | #include <linux/device.h> |
24 | #include <linux/serial_core.h> | 24 | #include <linux/serial_core.h> |
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
@@ -192,17 +192,18 @@ void __init s5pc100_init_irq(void) | |||
192 | s5p_init_irq(vic, ARRAY_SIZE(vic)); | 192 | s5p_init_irq(vic, ARRAY_SIZE(vic)); |
193 | } | 193 | } |
194 | 194 | ||
195 | static struct sysdev_class s5pc100_sysclass = { | 195 | static struct bus_type s5pc100_subsys = { |
196 | .name = "s5pc100-core", | 196 | .name = "s5pc100-core", |
197 | .dev_name = "s5pc100-core", | ||
197 | }; | 198 | }; |
198 | 199 | ||
199 | static struct sys_device s5pc100_sysdev = { | 200 | static struct device s5pc100_dev = { |
200 | .cls = &s5pc100_sysclass, | 201 | .bus = &s5pc100_subsys, |
201 | }; | 202 | }; |
202 | 203 | ||
203 | static int __init s5pc100_core_init(void) | 204 | static int __init s5pc100_core_init(void) |
204 | { | 205 | { |
205 | return sysdev_class_register(&s5pc100_sysclass); | 206 | return subsys_system_register(&s5pc100_subsys, NULL); |
206 | } | 207 | } |
207 | core_initcall(s5pc100_core_init); | 208 | core_initcall(s5pc100_core_init); |
208 | 209 | ||
@@ -213,7 +214,7 @@ int __init s5pc100_init(void) | |||
213 | /* set idle function */ | 214 | /* set idle function */ |
214 | pm_idle = s5pc100_idle; | 215 | pm_idle = s5pc100_idle; |
215 | 216 | ||
216 | return sysdev_register(&s5pc100_sysdev); | 217 | return device_register(&s5pc100_dev); |
217 | } | 218 | } |
218 | 219 | ||
219 | /* uart registration process */ | 220 | /* uart registration process */ |