From 9cf045d60de9aea6c718a3473314a57bbbfa3c41 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 20:51:03 +0900
Subject: [PATCH] --- yaml --- r: 198516 b: refs/heads/master c:
 dd1ef1a2a1b91c5bf1d6f45d0a0eaf9233e3570c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-s5pv210/cpu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3c9f4fab55d2..4a80a237d5a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d5c1fdcaa7d3d414ce5928601b9578b80441a90
+refs/heads/master: dd1ef1a2a1b91c5bf1d6f45d0a0eaf9233e3570c
diff --git a/trunk/arch/arm/mach-s5pv210/cpu.c b/trunk/arch/arm/mach-s5pv210/cpu.c
index 76084d85fd21..411a4a9cbfc7 100644
--- a/trunk/arch/arm/mach-s5pv210/cpu.c
+++ b/trunk/arch/arm/mach-s5pv210/cpu.c
@@ -76,7 +76,9 @@ static void s5pv210_idle(void)
 
 void __init s5pv210_map_io(void)
 {
+#ifdef CONFIG_S3C_DEV_ADC
 	s3c_device_adc.name	= "s3c64xx-adc";
+#endif
 
 	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));