tree 51ff899371af78df9ced0eee3973fdfdb512c905
parent c5e2caca6a0732108bec146844551767cfbc115c
author Ben Dooks <ben-linux@fluff.org> 1274627830 +0100
committer Ben Dooks <ben-linux@fluff.org> 1274628424 +0100

ARM: S5PC100: Fixup merge problems

Between problems with Kconfig and merging commits from several
different sources, it seems the s5pc100 build's move from plat-s5pc11
has had a few problems.

Since I do not have the trees to rebuild this quickly, the easiest
thing is to simply fix the errors found once the s5pc100_defconfig
actually builds.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>