diff options
-rw-r--r-- | drivers/serial/uartlite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index 59b674aa2c01..ae05a67d9dbe 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #define ULITE_CONTROL_IE 0x10 | 46 | #define ULITE_CONTROL_IE 0x10 |
47 | 47 | ||
48 | 48 | ||
49 | static struct uart_port ports[ULITE_NR_UARTS]; | 49 | static struct uart_port ulite_ports[ULITE_NR_UARTS]; |
50 | 50 | ||
51 | static int ulite_receive(struct uart_port *port, int stat) | 51 | static int ulite_receive(struct uart_port *port, int stat) |
52 | { | 52 | { |
@@ -329,7 +329,7 @@ static void ulite_console_putchar(struct uart_port *port, int ch) | |||
329 | static void ulite_console_write(struct console *co, const char *s, | 329 | static void ulite_console_write(struct console *co, const char *s, |
330 | unsigned int count) | 330 | unsigned int count) |
331 | { | 331 | { |
332 | struct uart_port *port = &ports[co->index]; | 332 | struct uart_port *port = &ulite_ports[co->index]; |
333 | unsigned long flags; | 333 | unsigned long flags; |
334 | unsigned int ier; | 334 | unsigned int ier; |
335 | int locked = 1; | 335 | int locked = 1; |
@@ -366,7 +366,7 @@ static int __init ulite_console_setup(struct console *co, char *options) | |||
366 | if (co->index < 0 || co->index >= ULITE_NR_UARTS) | 366 | if (co->index < 0 || co->index >= ULITE_NR_UARTS) |
367 | return -EINVAL; | 367 | return -EINVAL; |
368 | 368 | ||
369 | port = &ports[co->index]; | 369 | port = &ulite_ports[co->index]; |
370 | 370 | ||
371 | /* not initialized yet? */ | 371 | /* not initialized yet? */ |
372 | if (!port->membase) | 372 | if (!port->membase) |
@@ -420,7 +420,7 @@ static int __devinit ulite_probe(struct platform_device *pdev) | |||
420 | if (pdev->id < 0 || pdev->id >= ULITE_NR_UARTS) | 420 | if (pdev->id < 0 || pdev->id >= ULITE_NR_UARTS) |
421 | return -EINVAL; | 421 | return -EINVAL; |
422 | 422 | ||
423 | if (ports[pdev->id].membase) | 423 | if (ulite_ports[pdev->id].membase) |
424 | return -EBUSY; | 424 | return -EBUSY; |
425 | 425 | ||
426 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 426 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
@@ -431,7 +431,7 @@ static int __devinit ulite_probe(struct platform_device *pdev) | |||
431 | if (!res2) | 431 | if (!res2) |
432 | return -ENODEV; | 432 | return -ENODEV; |
433 | 433 | ||
434 | port = &ports[pdev->id]; | 434 | port = &ulite_ports[pdev->id]; |
435 | 435 | ||
436 | port->fifosize = 16; | 436 | port->fifosize = 16; |
437 | port->regshift = 2; | 437 | port->regshift = 2; |