Russell King 9ce93bdda7 ARM: fix new BSYM() usage introduced via for-arm-soc branch ...

Commit 32e55a777f ("ARM: 8389/1: Add cpu_resume_arm() for firmwares
that resume in ARM state") needed to introduce a new usage of BSYM()
to fix a problem with a previous patch.  This in turn causes a conflict
with the "bsym" branch which removes this symbol, replacing it with a
'badr' assembly macro.  Fix this up.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2015-06-12 21:19:35 +01:00

4.8 KiB

Raw Blame History

View Raw