The v3.10.24 merge created a merge conflict, which was not properly
resolved. Fixing the merge conflict and fixing the build of qemu arm.
(From OE-Core rev: 2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>