From: Uwe Kleine-König Date: Wed, 25 Mar 2015 10:44:14 +0000 (+0100) Subject: ARM: 8328/1: remove empty preprocessor #else branch X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15955e70320bdc5d60b153a572ee4d89ab34e3d3;p=linux-beck.git ARM: 8328/1: remove empty preprocessor #else branch When the patch for e16343c47e42 (ARM: 8160/1: drop warning about return_address not using unwind tables) was created there was still more code in said branch. Probably this simplification was just missed during conflict resolution when the patch was applied. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c index 24b4a04846eb..36ed35073289 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -56,8 +56,6 @@ void *return_address(unsigned int level) return NULL; } -#else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ - -#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ +#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ EXPORT_SYMBOL_GPL(return_address);