git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
drivers
/
serial
/
m32r_sio.c
diff --git
a/drivers/serial/m32r_sio.c
b/drivers/serial/m32r_sio.c
index
23d0305
..
611c97a
100644
(file)
--- a/
drivers/serial/m32r_sio.c
+++ b/
drivers/serial/m32r_sio.c
@@
-922,7
+922,7
@@
static void m32r_sio_config_port(struct uart_port *port, int flags)
static int
m32r_sio_verify_port(struct uart_port *port, struct serial_struct *ser)
{
static int
m32r_sio_verify_port(struct uart_port *port, struct serial_struct *ser)
{
- if (ser->irq >=
NR_IRQS
|| ser->irq < 0 ||
+ if (ser->irq >=
nr_irqs
|| ser->irq < 0 ||
ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
ser->type >= ARRAY_SIZE(uart_config))
return -EINVAL;
ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
ser->type >= ARRAY_SIZE(uart_config))
return -EINVAL;
@@
-1162,7
+1162,7
@@
static int __init m32r_sio_init(void)
printk(KERN_INFO "Serial: M32R SIO driver\n");
printk(KERN_INFO "Serial: M32R SIO driver\n");
- for (i = 0; i <
NR_IRQS
; i++)
+ for (i = 0; i <
nr_irqs
; i++)
spin_lock_init(&irq_lists[i].lock);
ret = uart_register_driver(&m32r_sio_reg);
spin_lock_init(&irq_lists[i].lock);
ret = uart_register_driver(&m32r_sio_reg);