diff options
| author |   Andrew Morton <akpm@osdl.org> | 2006-10-29 22:46:33 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 12:08:40 -0800 |
| commit | a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b (patch) | |
| tree | 7c068807b82bb1409582c4c67b10e8e0a02cc611 /drivers/serial/ioc4_serial.c | |
| parent | [PATCH] Fix dmsetup table output change (diff) | |
| download | linux-dev-a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b.tar.xz linux-dev-a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b.zip | |
[PATCH] ioc4_serial: irq flags fix
Use the correct type for the CPU flags.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial/ioc4_serial.c')
| -rw-r--r-- | drivers/serial/ioc4_serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index ff4fa25f9fd1..711bd1511439 100644 --- a/drivers/serial/ioc4_serial.c +++ b/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; |