[PATCH 6/7] arm: plat-omap: system.h: move voiceblue definitions into the board header
From: aaro.koskinen@iki.fi (Aaro Koskinen)
Date: 2011-01-18 07:52:44
Also in:
linux-omap
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Move voiceblue definitions into the board-specific header. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> --- arch/arm/plat-omap/include/plat/board-voiceblue.h | 6 ++++++ arch/arm/plat-omap/include/plat/system.h | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/board-voiceblue.h b/arch/arm/plat-omap/include/plat/board-voiceblue.h
index 27916b2..431d70e 100644
--- a/arch/arm/plat-omap/include/plat/board-voiceblue.h
+++ b/arch/arm/plat-omap/include/plat/board-voiceblue.h@@ -15,5 +15,11 @@ extern void voiceblue_wdt_enable(void); extern void voiceblue_wdt_disable(void); extern void voiceblue_wdt_ping(void); +#ifndef CONFIG_MACH_VOICEBLUE +#define voiceblue_reset() do {} while (0) +#else +extern void voiceblue_reset(void); +#endif + #endif /* __ASM_ARCH_VOICEBLUE_H */
diff --git a/arch/arm/plat-omap/include/plat/system.h b/arch/arm/plat-omap/include/plat/system.h
index d0a119f..24bb5ae 100644
--- a/arch/arm/plat-omap/include/plat/system.h
+++ b/arch/arm/plat-omap/include/plat/system.h@@ -9,14 +9,9 @@ #include <asm/mach-types.h> #include <mach/hardware.h> +#include <plat/board-voiceblue.h> #include <plat/prcm.h> -#ifndef CONFIG_MACH_VOICEBLUE -#define voiceblue_reset() do {} while (0) -#else -extern void voiceblue_reset(void); -#endif - static inline void arch_idle(void) { cpu_do_idle();
--
1.5.6.5