ARM: sirf: fix nonsynchronous issues between local codes and mainline

in many times of merging automatically or manually, we might import
some nonsynchronous issues between local codes and mainline. git diff
shows the files in this patch should be updated.

Change-Id: I6285eaf222446d6c4136a64de8f5ecafebbdfe43
Signed-off-by: Barry Song <Baohua.Song@csr.com>
5 files changed