diff options
| author | Russell King | 2015-06-12 22:19:35 +0200 |
|---|---|---|
| committer | Russell King | 2015-06-12 22:19:35 +0200 |
| commit | 9ce93bdda7b71fd154986d36c0c1ccf0e7338e26 (patch) | |
| tree | 27f58b37f1e0784bcf8e46fb3f66df3c3b74fbc7 /drivers/thermal/of-thermal.c | |
| parent | Merge branch 'for-arm-soc' into for-next (diff) | |
| download | kernel-qcow2-linux-9ce93bdda7b71fd154986d36c0c1ccf0e7338e26.tar.gz kernel-qcow2-linux-9ce93bdda7b71fd154986d36c0c1ccf0e7338e26.tar.xz kernel-qcow2-linux-9ce93bdda7b71fd154986d36c0c1ccf0e7338e26.zip | |
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>
Diffstat (limited to 'drivers/thermal/of-thermal.c')
0 files changed, 0 insertions, 0 deletions