diff options
Diffstat (limited to 'drivers/serial/atmel_serial.c')
-rw-r--r-- | drivers/serial/atmel_serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 3b420aeafc24..b96382da27e0 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
@@ -44,13 +44,13 @@ | |||
44 | 44 | ||
45 | #include "atmel_serial.h" | 45 | #include "atmel_serial.h" |
46 | 46 | ||
47 | #if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 47 | #if defined(CONFIG_SERIAL_ATMEL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
48 | #define SUPPORT_SYSRQ | 48 | #define SUPPORT_SYSRQ |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #include <linux/serial_core.h> | 51 | #include <linux/serial_core.h> |
52 | 52 | ||
53 | #ifdef CONFIG_SERIAL_AT91_TTYAT | 53 | #ifdef CONFIG_SERIAL_ATMEL_TTYAT |
54 | 54 | ||
55 | /* Use device name ttyAT, major 204 and minor 154-169. This is necessary if we | 55 | /* Use device name ttyAT, major 204 and minor 154-169. This is necessary if we |
56 | * should coexist with the 8250 driver, such as if we have an external 16C550 | 56 | * should coexist with the 8250 driver, such as if we have an external 16C550 |
@@ -726,7 +726,7 @@ void __init at91_register_uart_fns(struct at91_port_fns *fns) | |||
726 | } | 726 | } |
727 | 727 | ||
728 | 728 | ||
729 | #ifdef CONFIG_SERIAL_AT91_CONSOLE | 729 | #ifdef CONFIG_SERIAL_ATMEL_CONSOLE |
730 | static void at91_console_putchar(struct uart_port *port, int ch) | 730 | static void at91_console_putchar(struct uart_port *port, int ch) |
731 | { | 731 | { |
732 | while (!(UART_GET_CSR(port) & AT91_US_TXRDY)) | 732 | while (!(UART_GET_CSR(port) & AT91_US_TXRDY)) |