summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2006-10-04 16:02:06 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:25:05 -0700
commit9ab4f88b7ffdf338773e7755f923bc6b9e079834 (patch)
tree52c0ef143caf5c878ffbc88dd06d8d46a1bd8e26 /drivers
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')
-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 7397d5df6d9..2c5b72ccc4b 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,
*/
static const char *atmel_type(struct uart_port *port)
{
- return (port->type == PORT_AT91) ? "ATMEL_SERIAL" : NULL;
+ return (port->type == PORT_ATMEL) ? "ATMEL_SERIAL" : NULL;
}
/*
@@ -628,7 +628,7 @@ static int atmel_request_port(struct uart_port *port)
static void atmel_config_port(struct uart_port *port, int flags)
{
if (flags & UART_CONFIG_TYPE) {
- port->type = PORT_AT91;
+ port->type = PORT_ATMEL;
atmel_request_port(port);
}
}
@@ -639,7 +639,7 @@ static void atmel_config_port(struct uart_port *port, int flags)
static int atmel_verify_port(struct uart_port *port, struct serial_struct *ser)
{
int ret = 0;
- if (ser->type != PORT_UNKNOWN && ser->type != PORT_AT91)
+ if (ser->type != PORT_UNKNOWN && ser->type != PORT_ATMEL)
ret = -EINVAL;
if (port->irq != ser->irq)
ret = -EINVAL;