aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/pm.c2
-rw-r--r--arch/arm/mach-s3c2412/pm.c2
-rw-r--r--arch/arm/mach-s3c2440/s3c2442.c2
-rw-r--r--arch/arm/mach-s5p64x0/cpu.c2
-rw-r--r--arch/arm/mach-s5pc100/cpu.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 4b948eca73ef..fda5385deff6 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -137,7 +137,7 @@ arch_initcall(s3c2410_pm_drvinit);
137 137
138static struct subsys_interface s3c2410a_pm_interface = { 138static struct subsys_interface s3c2410a_pm_interface = {
139 .name = "s3c2410a_pm", 139 .name = "s3c2410a_pm",
140 subsys = &s3c2410a_subsys, 140 .subsys = &s3c2410a_subsys,
141 .add_dev = s3c2410_pm_add, 141 .add_dev = s3c2410_pm_add,
142}; 142};
143 143
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c
index fd7210d74db9..d1adfa65f66d 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 = {
95 95
96static __init int s3c2412_pm_init(void) 96static __init int s3c2412_pm_init(void)
97{ 97{
98 return subsys_interface_register_register(&s3c2412_pm_interface); 98 return subsys_interface_register(&s3c2412_pm_interface);
99} 99}
100 100
101arch_initcall(s3c2412_pm_init); 101arch_initcall(s3c2412_pm_init);
diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c
index 9ab15cdea706..8004e0497bf4 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)
151static struct subsys_interface s3c2442_clk_interface = { 151static struct subsys_interface s3c2442_clk_interface = {
152 .name = "s3c2442_clk", 152 .name = "s3c2442_clk",
153 .subsys = &s3c2442_subsys, 153 .subsys = &s3c2442_subsys,
154 .add_dev s3c2442_clk_add, 154 .add_dev = s3c2442_clk_add,
155}; 155};
156 156
157static __init int s3c2442_clk_init(void) 157static __init int s3c2442_clk_init(void)
diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c
index 8b029901d919..74387a1bc76a 100644
--- a/arch/arm/mach-s5p64x0/cpu.c
+++ b/arch/arm/mach-s5p64x0/cpu.c
@@ -195,7 +195,7 @@ struct bus_type s5p64x0_subsys = {
195 .dev_name = "s5p64x0-core", 195 .dev_name = "s5p64x0-core",
196}; 196};
197 197
198static struct device s5p64x0_subsys = { 198static struct device s5p64x0_dev = {
199 .bus = &s5p64x0_subsys, 199 .bus = &s5p64x0_subsys,
200}; 200};
201 201
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index af52c09291b1..330a10b23a5d 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -166,5 +166,5 @@ int __init s5pc100_init(void)
166 /* set idle function */ 166 /* set idle function */
167 pm_idle = s5pc100_idle; 167 pm_idle = s5pc100_idle;
168 168
169 return device_register(&s5pc100_sys); 169 return device_register(&s5pc100_dev);
170} 170}