diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 16:08:29 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 16:08:29 +0900 |
| commit | 7684f784b08f0b1568567ff5f23cf0f5dff86be5 (patch) | |
| tree | 13ed8e6ccb008cb79f3a6d03cc46c7b2c0b91d5e /arch/arm/mach-s3c2443/s3c2443.c | |
| parent | 05daf079259c7e5393f204503284ee90072cb348 (diff) | |
| parent | 6436b6a7a64f946c5a5f3d8a8c0e6404e2bda8d5 (diff) | |
| download | kernel_samsung_crespo-7684f784b08f0b1568567ff5f23cf0f5dff86be5.zip kernel_samsung_crespo-7684f784b08f0b1568567ff5f23cf0f5dff86be5.tar.gz kernel_samsung_crespo-7684f784b08f0b1568567ff5f23cf0f5dff86be5.tar.bz2 | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c2443/s3c2443.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/s3c2443.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c index 839b6b2..33d18dd 100644 --- 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/nand-core.h> 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; - s3c_device_nand.name = "s3c2412-nand"; + s3c_nand_setname("s3c2412-nand"); s3c_fb_setname("s3c2443-fb"); /* change WDT IRQ number */ |