git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c6400
/
s3c6400.c
diff --git
a/arch/arm/mach-s3c6400/s3c6400.c
b/arch/arm/mach-s3c6400/s3c6400.c
index
1ece887
..
b42bdd0
100644
(file)
--- a/
arch/arm/mach-s3c6400/s3c6400.c
+++ b/
arch/arm/mach-s3c6400/s3c6400.c
@@
-48,6
+48,8
@@
void __init s3c6400_map_io(void)
/* the i2c devices are directly compatible with s3c2440 */
s3c_i2c0_setname("s3c2440-i2c");
+
+ s3c_device_nand.name = "s3c6400-nand";
}
void __init s3c6400_init_clocks(int xtal)