From: Paul Jackson Date: Tue, 10 Jan 2006 04:54:08 +0000 (-0800) Subject: [PATCH] Serial: disable jsm in ppc64 defconfig X-Git-Tag: MMI-PSA29.97-13-9~53224 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e91c55b32a469d9dda845a90038c015a70838e3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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 CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_PMACZILOG is not set CONFIG_SERIAL_ICOM=m -CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256