aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx1
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-23 11:17:10 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-23 11:27:04 -0400
commit45c79433c02b8fe7b8a1cbf60548a9798d0502ed (patch)
tree51ff899371af78df9ced0eee3973fdfdb512c905 /arch/arm/mach-mx1
parentc5e2caca6a0732108bec146844551767cfbc115c (diff)
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>
Diffstat (limited to 'arch/arm/mach-mx1')
0 files changed, 0 insertions, 0 deletions