Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / unicore32 / kernel / rtc.c

diff --git a/arch/unicore32/kernel/rtc.c b/arch/unicore32/kernel/rtc.c
index c5f0682..8cad70b 100644 (file)
--- a/arch/unicore32/kernel/rtc.c
+++ b/arch/unicore32/kernel/rtc.c
@@ -88,11 +88,6 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
        return 0;
 }
 
-static int puv3_rtc_setfreq(struct device *dev, int freq)
-{
-       return 0;
-}
-
 /* Time read/write */
 
 static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
@@ -214,8 +209,6 @@ static const struct rtc_class_ops puv3_rtcops = {
        .set_time       = puv3_rtc_settime,
        .read_alarm     = puv3_rtc_getalarm,
        .set_alarm      = puv3_rtc_setalarm,
-       .irq_set_freq   = puv3_rtc_setfreq,
-       .irq_set_state  = puv3_rtc_setpie,
        .proc           = puv3_rtc_proc,
 };
 
@@ -294,8 +287,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
 
        puv3_rtc_enable(pdev, 1);
 
-       puv3_rtc_setfreq(&pdev->dev, 1);
-
        /* register RTC and exit */
 
        rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,