| commit | 9ce93bdda7b71fd154986d36c0c1ccf0e7338e26 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Jun 12 21:19:35 2015 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Jun 12 21:19:35 2015 +0100 |
| tree | 27f58b37f1e0784bcf8e46fb3f66df3c3b74fbc7 | |
| parent | a9dd3865dd1bd996a7e6af808645b7e566ced009 [diff] |
ARM: fix new BSYM() usage introduced via for-arm-soc branch
Commit 32e55a777f83 ("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>