From 2f05cbbc4a85082fd65dccd6215873985321e9eb Mon Sep 17 00:00:00 2001 From: Atul Dahiya Date: Mon, 18 Oct 2010 19:56:49 +0900 Subject: [PATCH] --- yaml --- r: 221163 b: refs/heads/master c: 4bc778661a86722b2c1128dd03851fa013ef26de h: refs/heads/master i: 221161: bdbed8766e8feacc80ce204df5936d634298328e 221159: 56d0bc97be355a9238cfd9562c23d12f80af7b84 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2416/s3c2416.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3c0b4ff830a8..cb60bf2ccb72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef3f2dd4810cca5bf5b1d3648968b50fb267d5e2 +refs/heads/master: 4bc778661a86722b2c1128dd03851fa013ef26de diff --git a/trunk/arch/arm/mach-s3c2416/s3c2416.c b/trunk/arch/arm/mach-s3c2416/s3c2416.c index 620718939628..63f39cdc0972 100644 --- a/trunk/arch/arm/mach-s3c2416/s3c2416.c +++ b/trunk/arch/arm/mach-s3c2416/s3c2416.c @@ -101,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_nand_setname("s3c2416-nand"); + s3c_nand_setname("s3c2412-nand"); } /* s3c2416_map_io