aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/atmel_serial.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2006-10-04 10:02:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 13:25:05 -0400
commit9ab4f88b7ffdf338773e7755f923bc6b9e079834 (patch)
tree52c0ef143caf5c878ffbc88dd06d8d46a1bd8e26 /drivers/serial/atmel_serial.c
parent7192f92c799e4bf4943e3e233d6e4d786ac4d8a4 (diff)
[PATCH] serial: Rename PORT_AT91 -> PORT_ATMEL
The at91_serial driver can be used with both AT32 and AT91 devices from Atmel and has therefore been renamed atmel_serial. The only thing left is to rename PORT_AT91 PORT_ATMEL. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial/atmel_serial.c')
-rw-r--r--drivers/serial/atmel_serial.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 7397d5df6d9f..2c5b72ccc4be 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -581,7 +581,7 @@ static void atmel_set_termios(struct uart_port *port, struct termios * termios,
581 */ 581 */
582static const char *atmel_type(struct uart_port *port) 582static const char *atmel_type(struct uart_port *port)
583{ 583{
584 return (port->type == PORT_AT91) ? "ATMEL_SERIAL" : NULL; 584 return (port->type == PORT_ATMEL) ? "ATMEL_SERIAL" : NULL;
585} 585}
586 586
587/* 587/*
@@ -628,7 +628,7 @@ static int atmel_request_port(struct uart_port *port)
628static void atmel_config_port(struct uart_port *port, int flags) 628static void atmel_config_port(struct uart_port *port, int flags)
629{ 629{
630 if (flags & UART_CONFIG_TYPE) { 630 if (flags & UART_CONFIG_TYPE) {
631 port->type = PORT_AT91; 631 port->type = PORT_ATMEL;
632 atmel_request_port(port); 632 atmel_request_port(port);
633 } 633 }
634} 634}
@@ -639,7 +639,7 @@ static void atmel_config_port(struct uart_port *port, int flags)
639static int atmel_verify_port(struct uart_port *port, struct serial_struct *ser) 639static int atmel_verify_port(struct uart_port *port, struct serial_struct *ser)
640{ 640{
641 int ret = 0; 641 int ret = 0;
642 if (ser->type != PORT_UNKNOWN && ser->type != PORT_AT91) 642 if (ser->type != PORT_UNKNOWN && ser->type != PORT_ATMEL)
643 ret = -EINVAL; 643 ret = -EINVAL;
644 if (port->irq != ser->irq) 644 if (port->irq != ser->irq)
645 ret = -EINVAL; 645 ret = -EINVAL;