Merge commit 'v2.6.34-rc7' into perf/nmi

[mv-sheeva.git] / drivers / rtc / rtc-bfin.c

diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index a118eb0f1e6729029be1a4fdb61aea52634ed260..72b2bcc2c22413b1a63e465e355ea65084ec7b8e 100644 (file)
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -51,6 +51,7 @@
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/seq_file.h>
+#include <linux/slab.h>
 
 #include <asm/blackfin.h>
 
@@ -383,7 +384,7 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
        }
 
        /* Grab the IRQ and init the hardware */
-       ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev);
+       ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, 0, pdev->name, dev);
        if (unlikely(ret))
                goto err_reg;
        /* sometimes the bootloader touched things, but the write complete was not