aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2013-03-09 23:16:44 +0100
committerBen Hutchings <ben@decadent.org.uk>2013-03-20 15:03:34 +0000
commit88ef123457c203b3c2a40ecb9b3022ecdd7b7dcb (patch)
treec06e11c8035d4c5735fc2161876944bda852c0df /drivers/tty
parent80d17151fa38f2caf1fd3d60f862ba6e4c19ab0c (diff)
downloadkernel_samsung_smdk4412-88ef123457c203b3c2a40ecb9b3022ecdd7b7dcb.zip
kernel_samsung_smdk4412-88ef123457c203b3c2a40ecb9b3022ecdd7b7dcb.tar.gz
kernel_samsung_smdk4412-88ef123457c203b3c2a40ecb9b3022ecdd7b7dcb.tar.bz2
tty: serial: fix typo "ARCH_S5P6450"
commit 827aa0d36d486f359808c8fb931cf7a71011a09d upstream. This could have been either ARCH_S5P64X0 or CPU_S5P6450. Looking at commit 2555e663b367b8d555e76023f4de3f6338c28d6c ("ARM: S5P64X0: Add UART serial support for S5P6450") - which added this typo - makes clear this should be CPU_S5P6450. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 925a1e5..3771277 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -464,7 +464,7 @@ config SERIAL_SAMSUNG_UARTS_4
config SERIAL_SAMSUNG_UARTS
int
depends on ARM && PLAT_SAMSUNG
- default 6 if ARCH_S5P6450
+ default 6 if CPU_S5P6450
default 4 if SERIAL_SAMSUNG_UARTS_4
default 3
help