From 45eabca46d34e184a393a3eca6b3522666321668 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 15 Aug 2012 20:57:27 +0200
Subject: [PATCH] --- yaml --- r: 328703 b: refs/heads/master c:
 35f2b0bd5911dc0eef3f5352b6acb79c69420111 h: refs/heads/master i:   328701:
 e46f7990a75ef3519c0bcd1cc264662fdd3b1bee   328699:
 1cce07284a73514288dc7c49dc8867b2d5591656   328695:
 faa92218d5dd9df9298dbad6117af6655fc6c0c9   328687:
 b03059a8bee531e3bc546f77950433576dc8a9f8   328671:
 7f48c5558fa1f8b1c249f5e1a0b354c163bcbc59   328639:
 9c0cee6cb11a86954dd431f78c5bf06b0cc98fa2   328575:
 1b6d99a4a7c2ff1f25dd8cde0bb8e4a290c8fec6   328447:
 b003e5e59922d0e9458ebf4af7243454989672f3   328191:
 ac852d27170ed6603614b48034e0bae0e5f1865c   327679:
 9dd685fb495fdbf23aef974fab57f7f04898b12a v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-shmobile/Makefile         |  2 +-
 trunk/arch/arm/mach-shmobile/common.c         | 24 -------------------
 .../arm/mach-shmobile/include/mach/common.h   |  8 +++++--
 4 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-shmobile/common.c

diff --git a/[refs] b/[refs]
index f65da2289676..4ea6fe404585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18c081e27666c5db33075bf7ae4694e091cf1d20
+refs/heads/master: 35f2b0bd5911dc0eef3f5352b6acb79c69420111
diff --git a/trunk/arch/arm/mach-shmobile/Makefile b/trunk/arch/arm/mach-shmobile/Makefile
index 0df5ae6740c6..fe2c97c179d1 100644
--- a/trunk/arch/arm/mach-shmobile/Makefile
+++ b/trunk/arch/arm/mach-shmobile/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common objects
-obj-y				:= timer.o console.o clock.o common.o
+obj-y				:= timer.o console.o clock.o
 
 # CPU objects
 obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o
diff --git a/trunk/arch/arm/mach-shmobile/common.c b/trunk/arch/arm/mach-shmobile/common.c
deleted file mode 100644
index 608aba9d60d7..000000000000
--- a/trunk/arch/arm/mach-shmobile/common.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <mach/common.h>
-
-void __init shmobile_init_late(void)
-{
-	shmobile_suspend_init();
-	shmobile_cpuidle_init();
-}
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/common.h b/trunk/arch/arm/mach-shmobile/include/mach/common.h
index 45e61dada030..9175c183ba7a 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/common.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/common.h
@@ -86,8 +86,6 @@ extern int r8a7779_boot_secondary(unsigned int cpu);
 extern void r8a7779_smp_prepare_cpus(void);
 extern void r8a7779_register_twd(void);
 
-extern void shmobile_init_late(void);
-
 #ifdef CONFIG_SUSPEND
 int shmobile_suspend_init(void);
 #else
@@ -100,4 +98,10 @@ int shmobile_cpuidle_init(void);
 static inline int shmobile_cpuidle_init(void) { return 0; }
 #endif
 
+static inline void shmobile_init_late(void)
+{
+	shmobile_suspend_init();
+	shmobile_cpuidle_init();
+}
+
 #endif /* __ARCH_MACH_COMMON_H */