From 5106b9888cbe29c09ed8ccccb1c552ab029518ed Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 17 Dec 2012 16:02:49 -0800
Subject: [PATCH] --- yaml --- r: 346445 b: refs/heads/master c:
 162a96ea4bc77ad8d553ea5de6300b6ed70d13e1 h: refs/heads/master i:   346443:
 6147610d88c1ee99d05708d4e3f14758c2878f91 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/rtc/rtc-dev.c | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 89a3b884817a..be55ea2ca3bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b99732932e1e398ec84baf6024afa23f5388716
+refs/heads/master: 162a96ea4bc77ad8d553ea5de6300b6ed70d13e1
diff --git a/trunk/drivers/rtc/rtc-dev.c b/trunk/drivers/rtc/rtc-dev.c
index cace6d3aed9a..9a86b4bd8699 100644
--- a/trunk/drivers/rtc/rtc-dev.c
+++ b/trunk/drivers/rtc/rtc-dev.c
@@ -379,25 +379,6 @@ static long rtc_dev_ioctl(struct file *file,
 		err = put_user(rtc->irq_freq, (unsigned long __user *)uarg);
 		break;
 
-#if 0
-	case RTC_EPOCH_SET:
-#ifndef rtc_epoch
-		/*
-		 * There were no RTC clocks before 1900.
-		 */
-		if (arg < 1900) {
-			err = -EINVAL;
-			break;
-		}
-		rtc_epoch = arg;
-		err = 0;
-#endif
-		break;
-
-	case RTC_EPOCH_READ:
-		err = put_user(rtc_epoch, (unsigned long __user *)uarg);
-		break;
-#endif
 	case RTC_WKALM_SET:
 		mutex_unlock(&rtc->ops_lock);
 		if (copy_from_user(&alarm, uarg, sizeof(alarm)))