[42/94] ARM: DRA7/AM43XX: fix header definition for omap44xx_restart

Message ID 1405443709-15288-42-git-send-email-asadi.samuel@gmail.com
State New
Headers show

Commit Message

sam-the-6 July 15, 2014, 5 p.m.
From: Nishanth Menon <nm@ti.com>

omap44xx_restart is defined as a static void inline when DRA7/AM437X is
defined alone, which implies that the restart function is no longer
functional even though it is built in. So, fix the definition of the

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: sam-the-6 <asadi.samuel@gmail.com>
 arch/arm/mach-omap2/common.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index b2d252b..dc571f1 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -162,7 +162,8 @@  static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd)
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
+	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
 void omap44xx_restart(enum reboot_mode mode, const char *cmd);
 static inline void omap44xx_restart(enum reboot_mode mode, const char *cmd)