aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/omap_zoom3_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-07 11:27:54 +0200
committerIngo Molnar <mingo@elte.hu>2010-05-07 11:27:54 +0200
commit48652ced1533c3372f996a0d83b6e73b1f1c9381 (patch)
tree5e17729cfcdc97bf798a17b57cdb888b4ded65b0 /arch/arm/configs/omap_zoom3_defconfig
parent99bd5e2f245d8cd17d040c82d40becdb3efd9b69 (diff)
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff)
downloadkernel_samsung_smdk4412-48652ced1533c3372f996a0d83b6e73b1f1c9381.zip
kernel_samsung_smdk4412-48652ced1533c3372f996a0d83b6e73b1f1c9381.tar.gz
kernel_samsung_smdk4412-48652ced1533c3372f996a0d83b6e73b1f1c9381.tar.bz2
Merge commit 'v2.6.34-rc6' into sched/core
Diffstat (limited to 'arch/arm/configs/omap_zoom3_defconfig')
-rw-r--r--arch/arm/configs/omap_zoom3_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_zoom3_defconfig b/arch/arm/configs/omap_zoom3_defconfig
index ea9a501..5e55b55 100644
--- a/arch/arm/configs/omap_zoom3_defconfig
+++ b/arch/arm/configs/omap_zoom3_defconfig
@@ -680,7 +680,7 @@ CONFIG_DEVKMEM=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y