diff options
| author | Paul Jackson <pj@sgi.com> | 2006-01-09 23:54:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:57 -0500 |
| commit | 7e91c55b32a469d9dda845a90038c015a70838e3 (patch) | |
| tree | bec63f967117566e325e8e4264fd5f69a152825c | |
| parent | 87c2ce3b9305b9b723faeedf6e32ef703ec9b33a (diff) | |
[PATCH] Serial: disable jsm in ppc64 defconfig
Changes to the serial driver to remove flip buffers have broken the serial
jsm driver. It doesn't even compile anymore. The jsm driver was enabled
in only one defconfig - ppc64. In order to keep defconfigs building,
disable CONFIG_SERIAL_JSM for the time being.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 509399eab6f5..347f4391db8d 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -861,7 +861,7 @@ CONFIG_SERIAL_CORE=y | |||
| 861 | CONFIG_SERIAL_CORE_CONSOLE=y | 861 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 862 | # CONFIG_SERIAL_PMACZILOG is not set | 862 | # CONFIG_SERIAL_PMACZILOG is not set |
| 863 | CONFIG_SERIAL_ICOM=m | 863 | CONFIG_SERIAL_ICOM=m |
| 864 | CONFIG_SERIAL_JSM=m | 864 | # CONFIG_SERIAL_JSM is not set |
| 865 | CONFIG_UNIX98_PTYS=y | 865 | CONFIG_UNIX98_PTYS=y |
| 866 | CONFIG_LEGACY_PTYS=y | 866 | CONFIG_LEGACY_PTYS=y |
| 867 | CONFIG_LEGACY_PTY_COUNT=256 | 867 | CONFIG_LEGACY_PTY_COUNT=256 |