summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkranzer <bernhard.rosenkranzer@linaro.org>2012-04-17 10:38:00 -0600
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-04-18 09:45:20 +0200
commite6227ac007c4048deeda58cf0191b4d90a0a5abf (patch)
treee1b1cd7479973358e4c49587a26ae73d8f8e7a4b
parent21fd4e193b8c04d377774f8b7d03584a481bbda0 (diff)
inlining without body is not allowed with gcc 4.7
Adding 'inline' before a function requires that the body be provided in the same file when using gcc 4.7. Signed-off-by: Bernhard Rosenkranzer <bernhard.rosenkranzer@linaro.org> Committed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-rw-r--r--arch/arm/mach-ux500/cpu-db9500.c2
-rw-r--r--arch/arm/mach-ux500/include/mach/id.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db9500.c b/arch/arm/mach-ux500/cpu-db9500.c
index 1bbc9b40c1b..4d900cbe537 100644
--- a/arch/arm/mach-ux500/cpu-db9500.c
+++ b/arch/arm/mach-ux500/cpu-db9500.c
@@ -19,7 +19,7 @@
* U9500 is currently using U8500v2 HW. Therefore, the platform detection
* is based on the kernel cmd line setting (early_param "pinsfor").
*/
-inline bool cpu_is_u9500()
+bool cpu_is_u9500()
{
if (pins_for_u9500())
return true;
diff --git a/arch/arm/mach-ux500/include/mach/id.h b/arch/arm/mach-ux500/include/mach/id.h
index e888929d43d..b27902a5f2b 100644
--- a/arch/arm/mach-ux500/include/mach/id.h
+++ b/arch/arm/mach-ux500/include/mach/id.h
@@ -65,7 +65,7 @@ static inline bool __attribute_const__ cpu_is_u5500(void)
}
#ifdef CONFIG_UX500_SOC_DB8500
-inline bool cpu_is_u9500(void);
+bool cpu_is_u9500(void);
#else
static inline bool cpu_is_u9500(void)
{