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>

diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 4b948eca73efcfc01beaefdd891576062e269e43..fda5385deff6f7e90800fa91006f472726705b86 100644 (file)
--- 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 fd7210d74db9a8ddceb40788c819b6570233924f..d1adfa65f66da97ca0bd356d391644aa1801c607 100644 (file)
--- 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 9ab15cdea706d7a625d94300b552f35616e596cb..8004e0497bf4e262cc52cf903b0bf49fcb026f9b 100644 (file)
--- 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 8b029901d91966280614417e2d1fae62cb665f79..74387a1bc76af334eda7ca8d483b6d411e9b420e 100644 (file)
--- 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 af52c09291b1fa56048de06ecc9f82a9e31a2861..330a10b23a5d741027bed471a7a0cc9bb53fe9e7 100644 (file)
--- 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);
 }