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 'l2x0-pull-rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2416
/
s3c2416.c
diff --git
a/arch/arm/mach-s3c2416/s3c2416.c
b/arch/arm/mach-s3c2416/s3c2416.c
index
bc30245
..
63f39cd
100644
(file)
--- a/
arch/arm/mach-s3c2416/s3c2416.c
+++ b/
arch/arm/mach-s3c2416/s3c2416.c
@@
-56,6
+56,7
@@
#include <plat/iic-core.h>
#include <plat/fb-core.h>
#include <plat/iic-core.h>
#include <plat/fb-core.h>
+#include <plat/nand-core.h>
static struct map_desc s3c2416_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
static struct map_desc s3c2416_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
@@
-100,7
+101,7
@@
void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no)
{
s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
{
s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
- s3c_
device_nand.name = "s3c2416-nand"
;
+ s3c_
nand_setname("s3c2412-nand")
;
}
/* s3c2416_map_io
}
/* s3c2416_map_io