diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/parisc/configs/a500_defconfig | |
parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) |
Merge ../linux-2.6/
Diffstat (limited to 'arch/parisc/configs/a500_defconfig')
-rw-r--r-- | arch/parisc/configs/a500_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index d28ebfa1070d..30fc03ed0cfb 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 |