1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 8edee745888a..ba19ab571f98 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