diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s3c2416/s3c2416.c | |
| parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
| parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s3c2416/s3c2416.c')
| -rw-r--r-- | arch/arm/mach-s3c2416/s3c2416.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c index bc30245e133..63f39cdc097 100644 --- 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/nand-core.h> 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); - s3c_device_nand.name = "s3c2416-nand"; + s3c_nand_setname("s3c2412-nand"); } /* s3c2416_map_io |