From 45c79433c02b8fe7b8a1cbf60548a9798d0502ed Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Sun, 23 May 2010 16:17:10 +0100 Subject: 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 --- arch/arm/mach-s5pc100/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-s5pc100/cpu.c') diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index 816c4d4..7b5bdbc 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 = { .type = MT_DEVICE, }, { .virtual = (unsigned long)VA_VIC2, - .pfn = __phys_to_pfn(S5PC100_PA_VIC2), + .pfn = __phys_to_pfn(S5P_PA_VIC2), .length = SZ_16K, .type = MT_DEVICE, }, { -- cgit v1.1