From: Ben Dooks Date: Sun, 23 May 2010 15:17:10 +0000 (+0100) Subject: ARM: S5PC100: Fixup merge problems X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c79433c02b8fe7b8a1cbf60548a9798d0502ed;p=pandora-kernel.git 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 --- Reading git-diff-tree failed