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, 3 insertions, 27 deletions

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 93314a9e7fa9..6ac55fd48413 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -344,27 +344,6 @@ static inline void sh_rtc_setcie(struct device *dev, unsigned int enable)
         spin_unlock_irq(&rtc->lock);
 }
 
-static int sh_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
-{
-        struct sh_rtc *rtc = dev_get_drvdata(dev);
-        unsigned int ret = 0;
-
-        switch (cmd) {
-        case RTC_UIE_OFF:
-                rtc->periodic_freq &= ~PF_OXS;
-                sh_rtc_setcie(dev, 0);
-                break;
-        case RTC_UIE_ON:
-                rtc->periodic_freq |= PF_OXS;
-                sh_rtc_setcie(dev, 1);
-                break;
-        default:
-                ret = -ENOIOCTLCMD;
-        }
-
-        return ret;
-}
-
 static int sh_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         sh_rtc_setaie(dev, enabled);
@@ -598,13 +577,10 @@ static int sh_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
 }
 
 static struct rtc_class_ops sh_rtc_ops = {
-        .ioctl          = sh_rtc_ioctl,
         .read_time      = sh_rtc_read_time,
         .set_time       = sh_rtc_set_time,
         .read_alarm     = sh_rtc_read_alarm,
         .set_alarm      = sh_rtc_set_alarm,
-        .irq_set_state  = sh_rtc_irq_set_state,
-        .irq_set_freq   = sh_rtc_irq_set_freq,
         .proc           = sh_rtc_proc,
         .alarm_irq_enable = sh_rtc_alarm_irq_enable,
 };
@@ -806,11 +782,11 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
         struct platform_device *pdev = to_platform_device(dev);
         struct sh_rtc *rtc = platform_get_drvdata(pdev);
 
-        set_irq_wake(rtc->periodic_irq, enabled);
+        irq_set_irq_wake(rtc->periodic_irq, enabled);
 
         if (rtc->carry_irq > 0) {
-                set_irq_wake(rtc->carry_irq, enabled);
-                set_irq_wake(rtc->alarm_irq, enabled);
+                irq_set_irq_wake(rtc->carry_irq, enabled);
+                irq_set_irq_wake(rtc->alarm_irq, enabled);
         }
 }