From cb79472f82163c3886d4f2eb89722fec43435801 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 29 Oct 2006 22:46:33 -0800 Subject: [PATCH] --- yaml --- r: 40465 b: refs/heads/master c: a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b h: refs/heads/master i: 40463: e536195ed541a34b6d56431a4b677730b51c10ea v: v3 --- [refs] | 2 +- trunk/drivers/serial/ioc4_serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 223ea62064f9..4a2a9ded9ead 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37af6560f7978c60791b5f3df17ce8b3e97f2d6e +refs/heads/master: a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b diff --git a/trunk/drivers/serial/ioc4_serial.c b/trunk/drivers/serial/ioc4_serial.c index ff4fa25f9fd1..711bd1511439 100644 --- a/trunk/drivers/serial/ioc4_serial.c +++ b/trunk/drivers/serial/ioc4_serial.c @@ -921,7 +921,7 @@ static void handle_dma_error_intr(void *arg, uint32_t other_ir) { struct ioc4_port *port = (struct ioc4_port *)arg; struct hooks *hooks = port->ip_hooks; - unsigned int flags; + unsigned long flags; spin_lock_irqsave(&port->ip_lock, flags); @@ -1834,7 +1834,7 @@ static void handle_intr(void *arg, uint32_t sio_ir) struct ioc4_port *port = (struct ioc4_port *)arg; struct hooks *hooks = port->ip_hooks; unsigned int rx_high_rd_aborted = 0; - unsigned int flags; + unsigned long flags; struct uart_port *the_port; int loop_counter;