diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-10-04 16:02:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:25:05 -0700 |
| commit | 749c4e60334580ee0f1427eb90ad006fecbffd21 (patch) | |
| tree | 902f94fc44a6ffa0e09914e603c36a37aef3e0c7 /drivers/serial | |
| parent | b6156b4e2e3b725ae3549882f59c82ab5b5048a5 (diff) | |
| download | kernel_samsung_smdk4412-749c4e60334580ee0f1427eb90ad006fecbffd21.zip kernel_samsung_smdk4412-749c4e60334580ee0f1427eb90ad006fecbffd21.tar.gz kernel_samsung_smdk4412-749c4e60334580ee0f1427eb90ad006fecbffd21.tar.bz2 | |
[PATCH] at91_serial -> atmel_serial: Kconfig symbols
Rename the following Kconfig symbols:
* CONFIG_SERIAL_AT91 -> CONFIG_SERIAL_ATMEL
* CONFIG_SERIAL_AT91_CONSOLE -> CONFIG_SERIAL_ATMEL_CONSOLE
* CONFIG_SERIAL_AT91_TTYAT -> CONFIG_SERIAL_ATMEL_TTYAT
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')
| -rw-r--r-- | drivers/serial/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/atmel_serial.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 8edee74..ba19ab5 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -299,17 +299,17 @@ config SERIAL_AMBA_PL011_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) -config SERIAL_AT91 - bool "AT91RM9200 / AT91SAM9261 serial port support" +config SERIAL_ATMEL + bool "AT91 / AT32 on-chip serial port support" depends on ARM && (ARCH_AT91RM9200 || ARCH_AT91SAM9261) select SERIAL_CORE help This enables the driver for the on-chip UARTs of the Atmel AT91RM9200 and AT91SAM926 processor. -config SERIAL_AT91_CONSOLE - bool "Support for console on AT91RM9200 / AT91SAM9261 serial port" - depends on SERIAL_AT91=y +config SERIAL_ATMEL_CONSOLE + bool "Support for console on AT91 / AT32 serial port" + depends on SERIAL_ATMEL=y select SERIAL_CORE_CONSOLE help Say Y here if you wish to use a UART on the Atmel AT91RM9200 or @@ -317,9 +317,9 @@ config SERIAL_AT91_CONSOLE which receives all kernel messages and warnings and which allows logins in single user mode). -config SERIAL_AT91_TTYAT +config SERIAL_ATMEL_TTYAT bool "Install as device ttyAT0-4 instead of ttyS0-4" - depends on SERIAL_AT91=y + depends on SERIAL_ATMEL=y help Say Y here if you wish to have the five internal AT91RM9200 UARTs appear as /dev/ttyAT0-4 (major 204, minor 154-158) instead of the diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index e49808a..b4d8a7c 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -54,5 +54,5 @@ obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o -obj-$(CONFIG_SERIAL_AT91) += atmel_serial.o +obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o obj-$(CONFIG_SERIAL_NETX) += netx-serial.o diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 3b420ae..b96382d 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -44,13 +44,13 @@ #include "atmel_serial.h" -#if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#if defined(CONFIG_SERIAL_ATMEL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ #endif #include <linux/serial_core.h> -#ifdef CONFIG_SERIAL_AT91_TTYAT +#ifdef CONFIG_SERIAL_ATMEL_TTYAT /* Use device name ttyAT, major 204 and minor 154-169. This is necessary if we * 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) } -#ifdef CONFIG_SERIAL_AT91_CONSOLE +#ifdef CONFIG_SERIAL_ATMEL_CONSOLE static void at91_console_putchar(struct uart_port *port, int ch) { while (!(UART_GET_CSR(port) & AT91_US_TXRDY)) |