From 7c986b6a0c18da6622ef4e9eae4e75c207f9e023 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 29 May 2012 15:07:40 -0700
Subject: [PATCH] --- yaml --- r: 308999 b: refs/heads/master c:
 ecb41a77411358d385e3fde5b4e98a5f3d9cfdd5 h: refs/heads/master i:   308997:
 c8cd9dba65e4d206a164ec9e82f0d9fc3299557e   308995:
 89e5dc481e84f4691782e71281471262bc415d9c   308991:
 0cc79fc9c1de3d14526526bcb7358af6f56725b6 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/rtc/rtc-s3c.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 79e2e75df0c7..84f21aa516f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 621bae79f1a250e443eb83d1f473c533bea493dc
+refs/heads/master: ecb41a77411358d385e3fde5b4e98a5f3d9cfdd5
diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c
index 3f3a29752369..7e6af0b22f17 100644
--- a/trunk/drivers/rtc/rtc-s3c.c
+++ b/trunk/drivers/rtc/rtc-s3c.c
@@ -670,6 +670,7 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 #define s3c_rtc_resume  NULL
 #endif
 
+#ifdef CONFIG_OF
 static struct s3c_rtc_drv_data s3c_rtc_drv_data_array[] = {
 	[TYPE_S3C2410] = { TYPE_S3C2410 },
 	[TYPE_S3C2416] = { TYPE_S3C2416 },
@@ -677,7 +678,6 @@ static struct s3c_rtc_drv_data s3c_rtc_drv_data_array[] = {
 	[TYPE_S3C64XX] = { TYPE_S3C64XX },
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id s3c_rtc_dt_match[] = {
 	{
 		.compatible = "samsung,s3c2410-rtc",