git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
omap_zoom2_defconfig
diff --git
a/arch/arm/configs/omap_zoom2_defconfig
b/arch/arm/configs/omap_zoom2_defconfig
index
f5c6e11
..
881faea
100644
(file)
--- a/
arch/arm/configs/omap_zoom2_defconfig
+++ b/
arch/arm/configs/omap_zoom2_defconfig
@@
-661,7
+661,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