summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-bfin.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-04-13 01:54:09 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-04-13 01:54:09 +0200
commit92f73a62a100d2068e8f327e573da01529184c18 (patch)
tree48a42be3879d8467c1860d3f14045feb6fccd64e /drivers/rtc/rtc-bfin.c
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
parent67c1b8c6aa354aad14aad85d36508fd73d1c6361 (diff)
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Diffstat (limited to 'drivers/rtc/rtc-bfin.c')
-rw-r--r--drivers/rtc/rtc-bfin.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index a0fc4cf42abf..90d866272c8e 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -250,6 +250,8 @@ static int bfin_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
bfin_rtc_int_set_alarm(rtc);
else
bfin_rtc_int_clear(~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));
+
+ return 0;
}
static int bfin_rtc_read_time(struct device *dev, struct rtc_time *tm)