Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: SH-4A UBC support
  sh: interrupt exception handling rework
  sh: Default enable R7780RP IRQs.
  sh: Zero-out coherent buffer in consistent_alloc().
  sh: Convert IPR-IRQ to IRQ chip.
  sh: Convert INTC2 IRQ handler to irq_chip.
  sh: Fix pr_debug statements for sh4
  sh: Convert r7780rp IRQ handler to IRQ chip.
  sh: Updates for IRQ handler changes.
  sh: Kill off timer_ops get_frequency().
  sh: First step at generic timeofday support.

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 8b6efcc05058..143302a8e79c 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -160,7 +160,7 @@ static int sh_rtc_open(struct device *dev)
         tmp |= RCR1_CIE;
         writeb(tmp, rtc->regbase + RCR1);
 
-        ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, SA_INTERRUPT,
+        ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, IRQF_DISABLED,
                           "sh-rtc period", dev);
         if (unlikely(ret)) {
                 dev_err(dev, "request period IRQ failed with %d, IRQ %d\n",
@@ -168,7 +168,7 @@ static int sh_rtc_open(struct device *dev)
                 return ret;
         }
 
-        ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, SA_INTERRUPT,
+        ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, IRQF_DISABLED,
                           "sh-rtc carry", dev);
         if (unlikely(ret)) {
                 dev_err(dev, "request carry IRQ failed with %d, IRQ %d\n",
@@ -177,7 +177,7 @@ static int sh_rtc_open(struct device *dev)
                 goto err_bad_carry;
         }
 
-        ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt, SA_INTERRUPT,
+        ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt, IRQF_DISABLED,
                           "sh-rtc alarm", dev);
         if (unlikely(ret)) {
                 dev_err(dev, "request alarm IRQ failed with %d, IRQ %d\n",
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 266aa325569e..cfcc3caf49d8 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -808,7 +808,7 @@ static int sci_request_irq(struct sci_port *port)
                 }
 
                 if (request_irq(port->irqs[0], sci_mpxed_interrupt,
-                                SA_INTERRUPT, "sci", port)) {
+                                IRQF_DISABLED, "sci", port)) {
                         printk(KERN_ERR "sci: Cannot allocate irq.\n");
                         return -ENODEV;
                 }
@@ -817,7 +817,7 @@ static int sci_request_irq(struct sci_port *port)
                         if (!port->irqs[i])
                                 continue;
                         if (request_irq(port->irqs[i], handlers[i],
-                                        SA_INTERRUPT, desc[i], port)) {
+                                        IRQF_DISABLED, desc[i], port)) {
                                 printk(KERN_ERR "sci: Cannot allocate irq.\n");
                                 return -ENODEV;
                         }