diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 00:00:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 00:00:38 -0400 |
| commit | 0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3 (patch) | |
| tree | 6e0a8c2bbd33c1cec2af6fbb1a6665751c07a631 /arch/parisc/defconfig | |
| parent | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (diff) | |
| parent | 026d02a236f429eb61a1277166bd425f8514c431 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/parisc/defconfig')
| -rw-r--r-- | arch/parisc/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/defconfig b/arch/parisc/defconfig index ebd6301aa599..fdae21c503d7 100644 --- a/arch/parisc/defconfig +++ b/arch/parisc/defconfig | |||
| @@ -517,7 +517,7 @@ CONFIG_HW_CONSOLE=y | |||
| 517 | # | 517 | # |
| 518 | CONFIG_SERIAL_8250=y | 518 | CONFIG_SERIAL_8250=y |
| 519 | CONFIG_SERIAL_8250_CONSOLE=y | 519 | CONFIG_SERIAL_8250_CONSOLE=y |
| 520 | CONFIG_SERIAL_8250_NR_UARTS=4 | 520 | CONFIG_SERIAL_8250_NR_UARTS=13 |
| 521 | CONFIG_SERIAL_8250_EXTENDED=y | 521 | CONFIG_SERIAL_8250_EXTENDED=y |
| 522 | CONFIG_SERIAL_8250_MANY_PORTS=y | 522 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 523 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 523 | CONFIG_SERIAL_8250_SHARE_IRQ=y |