Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15955e70 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Russell King
Browse files

ARM: 8328/1: remove empty preprocessor #else branch 



When the patch for e16343c4 (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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c20611df

arch/arm/kernel/return_address.c

+1 −3
Original line number Diff line number Diff line
@@ -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);