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 | |
| parent | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (diff) | |
| parent | 026d02a236f429eb61a1277166bd425f8514c431 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/configs/712_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/configs/a500_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/configs/b180_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/configs/c3000_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/defconfig | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig index 872085dea8..6efaa9293e 100644 --- a/arch/parisc/configs/712_defconfig +++ b/arch/parisc/configs/712_defconfig | |||
| @@ -506,7 +506,7 @@ CONFIG_HW_CONSOLE=y | |||
| 506 | # | 506 | # |
| 507 | CONFIG_SERIAL_8250=y | 507 | CONFIG_SERIAL_8250=y |
| 508 | CONFIG_SERIAL_8250_CONSOLE=y | 508 | CONFIG_SERIAL_8250_CONSOLE=y |
| 509 | CONFIG_SERIAL_8250_NR_UARTS=8 | 509 | CONFIG_SERIAL_8250_NR_UARTS=17 |
| 510 | CONFIG_SERIAL_8250_EXTENDED=y | 510 | CONFIG_SERIAL_8250_EXTENDED=y |
| 511 | CONFIG_SERIAL_8250_MANY_PORTS=y | 511 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 512 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 512 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index d28ebfa107..30fc03ed0c 100644 --- a/arch/parisc/configs/a500_defconfig +++ b/arch/parisc/configs/a500_defconfig | |||
| @@ -662,7 +662,7 @@ CONFIG_HW_CONSOLE=y | |||
| 662 | CONFIG_SERIAL_8250=y | 662 | CONFIG_SERIAL_8250=y |
| 663 | CONFIG_SERIAL_8250_CONSOLE=y | 663 | CONFIG_SERIAL_8250_CONSOLE=y |
| 664 | CONFIG_SERIAL_8250_CS=m | 664 | CONFIG_SERIAL_8250_CS=m |
| 665 | CONFIG_SERIAL_8250_NR_UARTS=8 | 665 | CONFIG_SERIAL_8250_NR_UARTS=17 |
| 666 | CONFIG_SERIAL_8250_EXTENDED=y | 666 | CONFIG_SERIAL_8250_EXTENDED=y |
| 667 | CONFIG_SERIAL_8250_MANY_PORTS=y | 667 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 668 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 668 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig index 1700d7aec6..46c9511f32 100644 --- a/arch/parisc/configs/b180_defconfig +++ b/arch/parisc/configs/b180_defconfig | |||
| @@ -514,7 +514,7 @@ CONFIG_HW_CONSOLE=y | |||
| 514 | # | 514 | # |
| 515 | CONFIG_SERIAL_8250=y | 515 | CONFIG_SERIAL_8250=y |
| 516 | CONFIG_SERIAL_8250_CONSOLE=y | 516 | CONFIG_SERIAL_8250_CONSOLE=y |
| 517 | CONFIG_SERIAL_8250_NR_UARTS=4 | 517 | CONFIG_SERIAL_8250_NR_UARTS=13 |
| 518 | CONFIG_SERIAL_8250_EXTENDED=y | 518 | CONFIG_SERIAL_8250_EXTENDED=y |
| 519 | CONFIG_SERIAL_8250_MANY_PORTS=y | 519 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 520 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 520 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index b27980161c..67aca6ccc9 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig | |||
| @@ -661,7 +661,7 @@ CONFIG_HW_CONSOLE=y | |||
| 661 | # | 661 | # |
| 662 | CONFIG_SERIAL_8250=y | 662 | CONFIG_SERIAL_8250=y |
| 663 | CONFIG_SERIAL_8250_CONSOLE=y | 663 | CONFIG_SERIAL_8250_CONSOLE=y |
| 664 | CONFIG_SERIAL_8250_NR_UARTS=4 | 664 | CONFIG_SERIAL_8250_NR_UARTS=13 |
| 665 | CONFIG_SERIAL_8250_EXTENDED=y | 665 | CONFIG_SERIAL_8250_EXTENDED=y |
| 666 | CONFIG_SERIAL_8250_MANY_PORTS=y | 666 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 667 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 667 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
diff --git a/arch/parisc/defconfig b/arch/parisc/defconfig index ebd6301aa5..fdae21c503 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 |