From 12029903190de8f1a640f84317f0157941ed0151 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkranzer Date: Tue, 17 Apr 2012 10:38:00 -0600 Subject: 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 Committed-by: Mathieu Poirier --- arch/arm/mach-ux500/cpu-db9500.c | 2 +- arch/arm/mach-ux500/include/mach/id.h | 2 +- 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 3bbeb0c9ae3..240534b19f3 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) { -- cgit v1.2.3