diff options
author | Andrew Morton <akpm@osdl.org> | 2006-10-30 01:46:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 15:08:40 -0500 |
commit | a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b (patch) | |
tree | 7c068807b82bb1409582c4c67b10e8e0a02cc611 | |
parent | 37af6560f7978c60791b5f3df17ce8b3e97f2d6e (diff) |
[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>
-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) | |||
921 | { | 921 | { |
922 | struct ioc4_port *port = (struct ioc4_port *)arg; | 922 | struct ioc4_port *port = (struct ioc4_port *)arg; |
923 | struct hooks *hooks = port->ip_hooks; | 923 | struct hooks *hooks = port->ip_hooks; |
924 | unsigned int flags; | 924 | unsigned long flags; |
925 | 925 | ||
926 | spin_lock_irqsave(&port->ip_lock, flags); | 926 | spin_lock_irqsave(&port->ip_lock, flags); |
927 | 927 | ||
@@ -1834,7 +1834,7 @@ static void handle_intr(void *arg, uint32_t sio_ir) | |||
1834 | struct ioc4_port *port = (struct ioc4_port *)arg; | 1834 | struct ioc4_port *port = (struct ioc4_port *)arg; |
1835 | struct hooks *hooks = port->ip_hooks; | 1835 | struct hooks *hooks = port->ip_hooks; |
1836 | unsigned int rx_high_rd_aborted = 0; | 1836 | unsigned int rx_high_rd_aborted = 0; |
1837 | unsigned int flags; | 1837 | unsigned long flags; |
1838 | struct uart_port *the_port; | 1838 | struct uart_port *the_port; |
1839 | int loop_counter; | 1839 | int loop_counter; |
1840 | 1840 | ||