Fix rebase error introduced in 63cbf0c63b

Fixes https://bugs.launchpad.net/u-boot-linaro/+bug/1103004

Signed-off-by: John Rigby <john.rigby@linaro.org>
1 file changed