diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-06 07:08:09 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 19:19:24 (GMT) |
| commit | ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e (patch) | |
| tree | 4e350bc43cfc3ff28cbbd04ce01e360c4341299f /arch | |
| parent | eea915bb0d1358755f151eaefb8208a2d5f3e10c (diff) | |
| download | linux-ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e.tar.xz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c2442.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pc100/cpu.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 4b948ec..fda5385 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c @@ -137,7 +137,7 @@ arch_initcall(s3c2410_pm_drvinit); static struct subsys_interface s3c2410a_pm_interface = { .name = "s3c2410a_pm", - subsys = &s3c2410a_subsys, + .subsys = &s3c2410a_subsys, .add_dev = s3c2410_pm_add, }; diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index fd7210d..d1adfa6 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c @@ -95,7 +95,7 @@ static struct subsys_interface s3c2412_pm_interface = { 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); diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c index 9ab15cd..8004e04 100644 --- a/arch/arm/mach-s3c2440/s3c2442.c +++ b/arch/arm/mach-s3c2440/s3c2442.c @@ -151,7 +151,7 @@ static int s3c2442_clk_add(struct device *dev) static struct subsys_interface s3c2442_clk_interface = { .name = "s3c2442_clk", .subsys = &s3c2442_subsys, - .add_dev s3c2442_clk_add, + .add_dev = s3c2442_clk_add, }; static __init int s3c2442_clk_init(void) diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c index 8b02990..74387a1 100644 --- a/arch/arm/mach-s5p64x0/cpu.c +++ b/arch/arm/mach-s5p64x0/cpu.c @@ -195,7 +195,7 @@ struct bus_type s5p64x0_subsys = { .dev_name = "s5p64x0-core", }; -static struct device s5p64x0_subsys = { +static struct device s5p64x0_dev = { .bus = &s5p64x0_subsys, }; diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index af52c09..330a10b 100644 --- a/arch/arm/mach-s5pc100/cpu.c +++ b/arch/arm/mach-s5pc100/cpu.c @@ -166,5 +166,5 @@ int __init s5pc100_init(void) /* set idle function */ pm_idle = s5pc100_idle; - return device_register(&s5pc100_sys); + return device_register(&s5pc100_dev); } |