From 7ea7555775328412f07dc6b7953f252d1ad07cdc Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <heiko@sntech.de>
Date: Wed, 12 Oct 2011 21:34:12 +0900
Subject: [PATCH] --- yaml --- r: 274091 b: refs/heads/master c:
 f8c414b516e17328bb1ab359b273c76a2e665b68 h: refs/heads/master i:   274089:
 5955ce0621972a590834c1ab3c51a050e6c14028   274087:
 6e3fa82e63fcafb6ce7e256f900d626c6569ca87 v: v3

---
 [refs]                                              | 2 +-
 trunk/arch/arm/plat-samsung/include/plat/adc-core.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9f8d98fd5731..9f92e83c71df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df303e0236417ca006e04116f18641dbe4bd704a
+refs/heads/master: f8c414b516e17328bb1ab359b273c76a2e665b68
diff --git a/trunk/arch/arm/plat-samsung/include/plat/adc-core.h b/trunk/arch/arm/plat-samsung/include/plat/adc-core.h
index a281568d5856..a927bee55359 100644
--- a/trunk/arch/arm/plat-samsung/include/plat/adc-core.h
+++ b/trunk/arch/arm/plat-samsung/include/plat/adc-core.h
@@ -20,7 +20,7 @@
 /* re-define device name depending on support. */
 static inline void s3c_adc_setname(char *name)
 {
-#ifdef CONFIG_SAMSUNG_DEV_ADC
+#if defined(CONFIG_SAMSUNG_DEV_ADC) || defined(CONFIG_PLAT_S3C24XX)
 	s3c_device_adc.name = name;
 #endif
 }