aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-12 11:33:23 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-12 11:33:23 -0400
commit9eb200748878751310cd9848c5dd4d467960beec (patch)
tree16458876279abbc597843a7c1bb8216474691380 /drivers/serial
parent8770c018da7bbaa3b41371abc401b2aa7e76a71a (diff)
parent8ae91b9ad88a130cd50fc0b78b16e7b9510b8067 (diff)
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.
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/sh-sci.c4
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)
808 } 808 }
809 809
810 if (request_irq(port->irqs[0], sci_mpxed_interrupt, 810 if (request_irq(port->irqs[0], sci_mpxed_interrupt,
811 SA_INTERRUPT, "sci", port)) { 811 IRQF_DISABLED, "sci", port)) {
812 printk(KERN_ERR "sci: Cannot allocate irq.\n"); 812 printk(KERN_ERR "sci: Cannot allocate irq.\n");
813 return -ENODEV; 813 return -ENODEV;
814 } 814 }
@@ -817,7 +817,7 @@ static int sci_request_irq(struct sci_port *port)
817 if (!port->irqs[i]) 817 if (!port->irqs[i])
818 continue; 818 continue;
819 if (request_irq(port->irqs[i], handlers[i], 819 if (request_irq(port->irqs[i], handlers[i],
820 SA_INTERRUPT, desc[i], port)) { 820 IRQF_DISABLED, desc[i], port)) {
821 printk(KERN_ERR "sci: Cannot allocate irq.\n"); 821 printk(KERN_ERR "sci: Cannot allocate irq.\n");
822 return -ENODEV; 822 return -ENODEV;
823 } 823 }