Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 0 insertions, 15 deletions

diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index ddb0857e15a4..781068d62f23 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -134,20 +134,6 @@ static void nuc900_rtc_bin2bcd(struct device *dev, struct rtc_time *settm,
         gettm->bcd_hour = bin2bcd(settm->tm_hour) << 16;
 }
 
-static int nuc900_update_irq_enable(struct device *dev, unsigned int enabled)
-{
-        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
-
-        if (enabled)
-                __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)|
-                                (TICKINTENB), rtc->rtc_reg + REG_RTC_RIER);
-        else
-                __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)&
-                                (~TICKINTENB), rtc->rtc_reg + REG_RTC_RIER);
-
-        return 0;
-}
-
 static int nuc900_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct nuc900_rtc *rtc = dev_get_drvdata(dev);
@@ -234,7 +220,6 @@ static struct rtc_class_ops nuc900_rtc_ops = {
         .read_alarm = nuc900_rtc_read_alarm,
         .set_alarm = nuc900_rtc_set_alarm,
         .alarm_irq_enable = nuc900_alarm_irq_enable,
-        .update_irq_enable = nuc900_update_irq_enable,
 };
 
 static int __devinit nuc900_rtc_probe(struct platform_device *pdev)