---

yaml --- r: 328703 b: refs/heads/master c: 35f2b0b h: refs/heads/master i: 328701: e46f799 328699: 1cce072 328695: faa9221 328687: b03059a 328671: 7f48c55 328639: 9c0cee6 328575: 1b6d99a 328447: b003e5e 328191: ac852d2 327679: 9dd685f v: v3
git-mirror · Sep 3, 2012 · 45eabca · 45eabca
1 parent 620442b
commit 45eabca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 28 deletions.
diff --git 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
@@ -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
diff --git 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 */