summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorJett.Zhou <jtzhou@marvell.com>2011-11-30 06:29:44 (GMT)
committerArnd Bergmann <arnd@arndb.de>2011-12-28 10:42:21 (GMT)
commit9d2d94385327f98ea69c183bb6c1d27cac49abf0 (patch)
tree4c7af3464e7cfceb600057219893ecdcc7fd7654 /drivers/rtc
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
downloadlinux-9d2d94385327f98ea69c183bb6c1d27cac49abf0.tar.xz
RTC: sa1100: Clean out ost register
These registers are used in old ioctl of UIE and PIE, now they are emulated by rtc generic code of hrtimer, so it can be removed. Signed-off-by: Jett.Zhou <jtzhou@marvell.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-sa1100.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 0b40bb8..6f22c1f 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -36,7 +36,6 @@
#ifdef CONFIG_ARCH_PXA
#include <mach/regs-rtc.h>
-#include <mach/regs-ost.h>
#endif
#define RTC_DEF_DIVIDER (32768 - 1)
@@ -188,8 +187,6 @@ static void sa1100_rtc_release(struct device *dev)
{
spin_lock_irq(&sa1100_rtc_lock);
RTSR = 0;
- OIER &= ~OIER_E1;
- OSSR = OSSR_M1;
spin_unlock_irq(&sa1100_rtc_lock);
free_irq(IRQ_RTCAlrm, dev);