aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c6410
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:06 +0100
committerBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:06 +0100
commitb282e29b547937d1610f38d6aa1c485426b62650 (patch)
tree62741a6d17e910e7b77a5cc4e94c44b7e587645c /arch/arm/mach-s3c6410
parentc378aa275e1476218a6b438056a4cd48eb1eca0f (diff)
parentc233d94931cebc8ec805fb98856f34ad16d49e4f (diff)
Merge branch 'next-s3c64xx-moves' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c6410')
-rw-r--r--arch/arm/mach-s3c6410/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/cpu.c b/arch/arm/mach-s3c6410/cpu.c
index ade904de889..9b67c663d9d 100644
--- a/arch/arm/mach-s3c6410/cpu.c
+++ b/arch/arm/mach-s3c6410/cpu.c
@@ -62,6 +62,8 @@ void __init s3c6410_map_io(void)
/* the i2c devices are directly compatible with s3c2440 */
s3c_i2c0_setname("s3c2440-i2c");
s3c_i2c1_setname("s3c2440-i2c");
+
+ s3c_device_nand.name = "s3c6400-nand";
}
void __init s3c6410_init_clocks(int xtal)