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.

1 files changed, 2 insertions, 2 deletions

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;
                         }