ARM: 8328/1: remove empty preprocessor #else branch
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 25 Mar 2015 10:44:14 +0000 (11:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2015 16:54:53 +0000 (16:54 +0000)
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 <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/return_address.c

index 24b4a04846ebe749c3ce5ec4fc2b82a9961c2a5f..36ed35073289b4af2c3053abfeb9e4bcb892c2b4 100644 (file)
@@ -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);