ARM: shmobile: Move definition of shmobile_init_late() to header (35f2b0bd) · Commits · 戴 / test

arch/arm/mach-shmobile/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* 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();
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -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 */