summaryrefslogtreecommitdiff
path: root/arch/arm/configs/ixdp2800_defconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 23:39:24 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 23:39:24 +0300
commit7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (patch)
tree541909f86c31fee97cd70d28ec2fe5c23e1ceb02 /arch/arm/configs/ixdp2800_defconfig
parentf1e691a24955ea987f021f378324fb5003b1b208 (diff)
parent70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff)
downloadlinux-7211bb9b64f17b23834d91fc3d0c1d78671ee9a8.tar.xz
Merge branch 'master'
Diffstat (limited to 'arch/arm/configs/ixdp2800_defconfig')
-rw-r--r--arch/arm/configs/ixdp2800_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ixdp2800_defconfig b/arch/arm/configs/ixdp2800_defconfig
index 261e2343903b..81d3a0606f95 100644
--- a/arch/arm/configs/ixdp2800_defconfig
+++ b/arch/arm/configs/ixdp2800_defconfig
@@ -559,7 +559,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_NR_UARTS=1
# CONFIG_SERIAL_8250_EXTENDED is not set
#