From 7fdf9be268e4df8697ae26a171517cda17f5df2e Mon Sep 17 00:00:00 2001 From: Naveen Krishna Ch Date: Fri, 8 Oct 2010 20:53:08 +0900 Subject: [PATCH] --- yaml --- r: 212643 b: refs/heads/master c: 6c6ad435cae29575ff632d97afedbcc2ce2e3840 h: refs/heads/master i: 212641: 0d227657c969c0d079c090dbc6f2ea32ccead53d 212639: c1bf4390a06bbb5d1eb0e56beb418aa29bb0badc v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5p64x0/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c319546e5a9f..973f923d310f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7df2a7beb9cbdd1acfd52200e2de76ec18c90a1 +refs/heads/master: 6c6ad435cae29575ff632d97afedbcc2ce2e3840 diff --git a/trunk/arch/arm/mach-s5p64x0/cpu.c b/trunk/arch/arm/mach-s5p64x0/cpu.c index fb90a3004e98..0a2d88a4e5e5 100644 --- a/trunk/arch/arm/mach-s5p64x0/cpu.c +++ b/trunk/arch/arm/mach-s5p64x0/cpu.c @@ -106,7 +106,7 @@ static void s5p64x0_idle(void) void __init s5p6440_map_io(void) { /* initialize any device information early */ - s3c_adc_setname("s3c64x0-adc"); + s3c_adc_setname("s3c64xx-adc"); iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc)); @@ -115,7 +115,7 @@ void __init s5p6440_map_io(void) void __init s5p6450_map_io(void) { /* initialize any device information early */ - s3c_adc_setname("s3c64x0-adc"); + s3c_adc_setname("s3c64xx-adc"); iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6440_iodesc));