summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-05-16 17:36:09 -0500
committerTony Lindgren <tony@atomide.com>2014-07-07 04:57:06 -0700
commit7abb1a530e87fce0d73f85ac7802648bb542cf26 (patch)
tree0c32d902a3d42755e4e7945074d0c8746b72daf7
parentcd3de83f147601356395b57a8673e9c5ff1e59d1 (diff)
downloadblackbird-op-linux-7abb1a530e87fce0d73f85ac7802648bb542cf26.tar.gz
blackbird-op-linux-7abb1a530e87fce0d73f85ac7802648bb542cf26.zip
ARM: DRA7/AM43XX: fix header definition for omap44xx_restart
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 same. Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index b2d252bf4a53..dc571f1d3b8a 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)
}
#endif
-#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);
#else
static inline void omap44xx_restart(enum reboot_mode mode, const char *cmd)
OpenPOWER on IntegriCloud