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 'master' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
s3c6410.c
diff --git
a/arch/arm/mach-s3c64xx/s3c6410.c
b/arch/arm/mach-s3c64xx/s3c6410.c
index
3ab695c
..
014401c
100644
(file)
--- a/
arch/arm/mach-s3c64xx/s3c6410.c
+++ b/
arch/arm/mach-s3c64xx/s3c6410.c
@@
-39,6
+39,7
@@
#include <plat/sdhci.h>
#include <plat/iic-core.h>
#include <plat/adc.h>
#include <plat/sdhci.h>
#include <plat/iic-core.h>
#include <plat/adc.h>
+#include <plat/onenand-core.h>
#include <mach/s3c6400.h>
#include <mach/s3c6410.h>
#include <mach/s3c6400.h>
#include <mach/s3c6410.h>
@@
-55,6
+56,8
@@
void __init s3c6410_map_io(void)
s3c_device_adc.name = "s3c64xx-adc";
s3c_device_nand.name = "s3c6400-nand";
s3c_device_adc.name = "s3c64xx-adc";
s3c_device_nand.name = "s3c6400-nand";
+ s3c_onenand_setname("s3c6410-onenand");
+ s3c64xx_onenand1_setname("s3c6410-onenand");
}
void __init s3c6410_init_clocks(int xtal)
}
void __init s3c6410_init_clocks(int xtal)