X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=arch%2Farm%2Fconfigs%2Fcsb337_defconfig;fp=arch%2Farm%2Fconfigs%2Fcsb337_defconfig;h=a2d6fd398f16b4acea1abd03b21e6f0e2e85a74d;hb=749c4e60334580ee0f1427eb90ad006fecbffd21;hp=cf3fa5cb26e4174bdcc5ba01180035fb3e80561c;hpb=b6156b4e2e3b725ae3549882f59c82ab5b5048a5;p=sfrench%2Fcifs-2.6.git

diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig
index cf3fa5cb26e4..a2d6fd398f16 100644
--- a/arch/arm/configs/csb337_defconfig
+++ b/arch/arm/configs/csb337_defconfig
@@ -591,9 +591,9 @@ CONFIG_HW_CONSOLE=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AT91=y
-CONFIG_SERIAL_AT91_CONSOLE=y
-# CONFIG_SERIAL_AT91_TTYAT is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y