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 branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2443
/
s3c2443.c
diff --git
a/arch/arm/mach-s3c2443/s3c2443.c
b/arch/arm/mach-s3c2443/s3c2443.c
index
839b6b2
..
33d18dd
100644
(file)
--- a/
arch/arm/mach-s3c2443/s3c2443.c
+++ b/
arch/arm/mach-s3c2443/s3c2443.c
@@
-36,6
+36,7
@@
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/fb-core.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/fb-core.h>
+#include <plat/nand-core.h>
static struct map_desc s3c2443_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
static struct map_desc s3c2443_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
@@
-62,7
+63,7
@@
int __init s3c2443_init(void)
s3c24xx_reset_hook = s3c2443_hard_reset;
s3c24xx_reset_hook = s3c2443_hard_reset;
- s3c_
device_nand.name = "s3c2412-nand"
;
+ s3c_
nand_setname("s3c2412-nand")
;
s3c_fb_setname("s3c2443-fb");
/* change WDT IRQ number */
s3c_fb_setname("s3c2443-fb");
/* change WDT IRQ number */