projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c5e2cac) | patch
ARM: S5PC100: Fixup merge problems
authorBen Dooks <ben-linux@fluff.org>
Sun, 23 May 2010 15:17:10 +0000 (16:17 +0100)
committerBen Dooks <ben-linux@fluff.org>
Sun, 23 May 2010 15:27:04 +0000 (16:27 +0100)
commit45c79433c02b8fe7b8a1cbf60548a9798d0502ed
tree51ff899371af78df9ced0eee3973fdfdb512c905tree | snapshot
parentc5e2caca6a0732108bec146844551767cfbc115ccommit | 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>
arch/arm/mach-s5pc100/cpu.c diff | blob | history
arch/arm/mach-s5pc100/dma.c diff | blob | history
arch/arm/mach-s5pc100/include/mach/map.h diff | blob | history
arch/arm/mach-s5pc100/include/mach/regs-gpio.h diff | blob | history
Domain: System / Uncategorized;