ARM: S5PC100: Fixup merge problems

[net-next-2.6.git] / arch / arm / mach-s5pc100 / cpu.c

diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index d424a9fda034b2868e8fd82e2efacbb8d8525444..7b5bdbc9a5df32a1e182cf6864af2bf8620676e3 100644 (file)
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -40,6 +40,8 @@
 #include <plat/clock.h>
 #include <plat/iic-core.h>
 #include <plat/sdhci.h>
+#include <plat/onenand-core.h>
+
 #include <plat/s5pc100.h>
 
 /* Initial IO mappings */
@@ -52,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,
        }, {
@@ -88,6 +90,8 @@ void __init s5pc100_map_io(void)
        /* the i2c devices are directly compatible with s3c2440 */
        s3c_i2c0_setname("s3c2440-i2c");
        s3c_i2c1_setname("s3c2440-i2c");
+
+       s3c_onenand_setname("s5pc100-onenand");
 }
 
 void __init s5pc100_init_clocks(int xtal)