From 2d576aadbfbc5a7471a5cd874f3310f6284b5c1b Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 6 Jan 2012 16:08:09 +0900
Subject: [PATCH] --- yaml --- r: 280095 b: refs/heads/master c:
 ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e h: refs/heads/master i:   280093:
 e5ecd797424f897ff1fcd339919a27c990646c2a   280091:
 a0d8b70323b31223999b5e0f8bd842f8bfced8e2   280087:
 d0d43a63f90fc4e3d42583fda73536fc6f16cbc8   280079:
 2653c3bf437051e376b770da4179eb882fb1b735   280063:
 1c3054590e9d515c8c3aa1dbd71ff43b0006d51e v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-s3c2410/pm.c      | 2 +-
 trunk/arch/arm/mach-s3c2412/pm.c      | 2 +-
 trunk/arch/arm/mach-s3c2440/s3c2442.c | 2 +-
 trunk/arch/arm/mach-s5p64x0/cpu.c     | 2 +-
 trunk/arch/arm/mach-s5pc100/cpu.c     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 12ad9bde65c0..daa7ba8344c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eea915bb0d1358755f151eaefb8208a2d5f3e10c
+refs/heads/master: ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e
diff --git a/trunk/arch/arm/mach-s3c2410/pm.c b/trunk/arch/arm/mach-s3c2410/pm.c
index 4b948eca73ef..fda5385deff6 100644
--- a/trunk/arch/arm/mach-s3c2410/pm.c
+++ b/trunk/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/trunk/arch/arm/mach-s3c2412/pm.c b/trunk/arch/arm/mach-s3c2412/pm.c
index fd7210d74db9..d1adfa65f66d 100644
--- a/trunk/arch/arm/mach-s3c2412/pm.c
+++ b/trunk/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/trunk/arch/arm/mach-s3c2440/s3c2442.c b/trunk/arch/arm/mach-s3c2440/s3c2442.c
index 9ab15cdea706..8004e0497bf4 100644
--- a/trunk/arch/arm/mach-s3c2440/s3c2442.c
+++ b/trunk/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/trunk/arch/arm/mach-s5p64x0/cpu.c b/trunk/arch/arm/mach-s5p64x0/cpu.c
index 8b029901d919..74387a1bc76a 100644
--- a/trunk/arch/arm/mach-s5p64x0/cpu.c
+++ b/trunk/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/trunk/arch/arm/mach-s5pc100/cpu.c b/trunk/arch/arm/mach-s5pc100/cpu.c
index af52c09291b1..330a10b23a5d 100644
--- a/trunk/arch/arm/mach-s5pc100/cpu.c
+++ b/trunk/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);
 }