aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 11:08:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 11:08:57 -0700
commit428929a234d2c4b8a6d0145d0dcf687fcfa27325 (patch)
treedd097eeabbd41c4713be5ea7663f52399183fd84 /drivers
parent0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (diff)
parent8c1addbc752660e95bbf2128d66b8e5bb38d5fc7 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix breakage from irq change
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/sn_console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 709f93a6c18..956b2cf08e1 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -674,7 +674,7 @@ static void sn_sal_timer_poll(unsigned long data)
if (!port->sc_port.irq) {
spin_lock_irqsave(&port->sc_port.lock, flags);
if (sn_process_input)
- sn_receive_chars(port, NULL, flags);
+ sn_receive_chars(port, flags);
sn_transmit_chars(port, TRANSMIT_RAW);
spin_unlock_irqrestore(&port->sc_port.lock, flags);
mod_timer(&port->sc_timer,