summaryrefslogtreecommitdiffstats
path: root/arch/sh/configs/rts7751r2dplus_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-06 08:37:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-06 08:37:39 -0700
commitbbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079 (patch)
tree578a2c07181a1832eea2dd4195b6ff2fcebf4c83 /arch/sh/configs/rts7751r2dplus_defconfig
parent722154e4cacf015161efe60009ae9be23d492296 (diff)
parent8bed90557d2600d25e58de30df48b244980164ec (diff)
downloadblackbird-obmc-linux-bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079.tar.gz
blackbird-obmc-linux-bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079.zip
Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: fix a number of Oopses and leaks in SH framebuffer driver SH: fix error paths in DMA driver sh: sh7751 pci controller io port fix sh: Fix maximum number of SCIF ports in R2D defconfigs SH: fix TS field shift calculation for DMA drivers
Diffstat (limited to 'arch/sh/configs/rts7751r2dplus_defconfig')
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index a8d538f06e67..6d511d06cbf6 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -963,7 +963,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
#
# CONFIG_SERIAL_MAX3100 is not set
CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=1
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
CONFIG_SERIAL_SH_SCI_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
OpenPOWER on IntegriCloud