UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: fix up some samsung merge sysdev conversion problems 

Following should be fixed in your driver-core/driver-core-next.

From: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kukjin Kim 2012-01-06 16:08:09 +09:00 committed by Greg Kroah-Hartman
parent eea915bb0d
commit ea04018e6b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c2410/pm.c
View File

@ -137,7 +137,7 @@ arch_initcall(s3c2410_pm_drvinit);
static struct subsys_interface s3c2410a_pm_interface = { static struct subsys_interface s3c2410a_pm_interface = {
.name = "s3c2410a_pm", .name = "s3c2410a_pm",
subsys = &s3c2410a_subsys, .subsys = &s3c2410a_subsys,
.add_dev = s3c2410_pm_add, .add_dev = s3c2410_pm_add,
}; };

2
arch/arm/mach-s3c2412/pm.c
View File

@ -95,7 +95,7 @@ static struct subsys_interface s3c2412_pm_interface = {
static __init int s3c2412_pm_init(void) static __init int s3c2412_pm_init(void)
{ {
return subsys_interface_register_register(&s3c2412_pm_interface); return subsys_interface_register(&s3c2412_pm_interface);
} }
arch_initcall(s3c2412_pm_init); arch_initcall(s3c2412_pm_init);

2
arch/arm/mach-s3c2440/s3c2442.c
View File

@ -151,7 +151,7 @@ static int s3c2442_clk_add(struct device *dev)
static struct subsys_interface s3c2442_clk_interface = { static struct subsys_interface s3c2442_clk_interface = {
.name = "s3c2442_clk", .name = "s3c2442_clk",
.subsys = &s3c2442_subsys, .subsys = &s3c2442_subsys,
.add_dev s3c2442_clk_add, .add_dev = s3c2442_clk_add,
}; };
static __init int s3c2442_clk_init(void) static __init int s3c2442_clk_init(void)

2
arch/arm/mach-s5p64x0/cpu.c
View File

@ -195,7 +195,7 @@ struct bus_type s5p64x0_subsys = {
.dev_name = "s5p64x0-core", .dev_name = "s5p64x0-core",
}; };
static struct device s5p64x0_subsys = { static struct device s5p64x0_dev = {
.bus = &s5p64x0_subsys, .bus = &s5p64x0_subsys,
}; };

2
arch/arm/mach-s5pc100/cpu.c
View File

@ -166,5 +166,5 @@ int __init s5pc100_init(void)
/* set idle function */ /* set idle function */
pm_idle = s5pc100_idle; pm_idle = s5pc100_idle;
return device_register(&s5pc100_sys); return device_register(&s5pc100_dev);
} }