diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-20 19:48:18 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-20 19:48:18 +0100 |
commit | 695a9d236a6fd5a60557a02eff612880c37fe731 (patch) | |
tree | 0ca809031f5f7139568914fe73ab5e244532aaf8 /drivers/serial/Kconfig | |
parent | c322e24b40b83bbdfa7c269bc0105e76a39e627f (diff) | |
parent | 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d (diff) | |
download | linux-rt-695a9d236a6fd5a60557a02eff612880c37fe731.tar.gz |
Merge AT91 branch
Diffstat (limited to 'drivers/serial/Kconfig')
-rw-r--r-- | drivers/serial/Kconfig | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 7d22dc0478d3..5ea778fc1caa 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -300,21 +300,22 @@ config SERIAL_AMBA_PL011_CONSOLE kernel at boot time.) config SERIAL_AT91 - bool "AT91RM9200 serial port support" - depends on ARM && ARCH_AT91RM9200 + bool "AT91RM9200 / AT91SAM9261 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 AT91RM9200 - processor. + 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 serial port" + bool "Support for console on AT91RM9200 / AT91SAM9261 serial port" depends on SERIAL_AT91=y select SERIAL_CORE_CONSOLE help - Say Y here if you wish to use a UART on the AT91RM9200 as the system - console (the system console is the device which receives all kernel - messages and warnings and which allows logins in single user mode). + Say Y here if you wish to use a UART on the Atmel AT91RM9200 or + AT91SAM9261 as the system console (the system console is the device + which receives all kernel messages and warnings and which allows + logins in single user mode). config SERIAL_AT91_TTYAT bool "Install as device ttyAT0-4 instead of ttyS0-4" |