diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:17:10 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:27:04 -0400 |
commit | 45c79433c02b8fe7b8a1cbf60548a9798d0502ed (patch) | |
tree | 51ff899371af78df9ced0eee3973fdfdb512c905 /arch/arm/mach-s5pc100/cpu.c | |
parent | c5e2caca6a0732108bec146844551767cfbc115c (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-s5pc100/cpu.c')
-rw-r--r-- | arch/arm/mach-s5pc100/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index 816c4d4afef0..7b5bdbc9a5df 100644 --- a/arch/arm/mach-s5pc100/cpu.c +++ b/arch/arm/mach-s5pc100/cpu.c | |||
@@ -54,7 +54,7 @@ static struct map_desc s5pc100_iodesc[] __initdata = { | |||
54 | .type = MT_DEVICE, | 54 | .type = MT_DEVICE, |
55 | }, { | 55 | }, { |
56 | .virtual = (unsigned long)VA_VIC2, | 56 | .virtual = (unsigned long)VA_VIC2, |
57 | .pfn = __phys_to_pfn(S5PC100_PA_VIC2), | 57 | .pfn = __phys_to_pfn(S5P_PA_VIC2), |
58 | .length = SZ_16K, | 58 | .length = SZ_16K, |
59 | .type = MT_DEVICE, | 59 | .type = MT_DEVICE, |
60 | }, { | 60 | }, { |