aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/defconfig
diff options
context:
space:
mode:
authorBrent Casavant <bcasavan@sgi.com>2005-06-21 20:16:01 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 21:46:32 -0400
commite5d310b349b2cbcc0dab31139c92201f332695bb (patch)
tree2884b77c09a575d8252bb490d384e8f1ece19d42 /arch/ia64/defconfig
parent22329b511a97557b293583194037d1f4c71e1504 (diff)
[PATCH] ioc4: CONFIG split
The SGI IOC4 I/O controller chip drivers are currently all configured by CONFIG_BLK_DEV_SGIIOC4. This is undesirable as not all IOC4 hardware features are needed by all systems. This patch adds two configuration variables, CONFIG_SGI_IOC4 for core IOC4 driver support (see patch 1/3 in this series for further explanation) and CONFIG_SERIAL_SGI_IOC4 to independently enable serial port support. Signed-off-by: Brent Casavant <bcasavan@sgi.com> Acked-by: Pat Gefre <pfg@sgi.com> Acked-by: Jeremy Higdon <jeremy@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64/defconfig')
-rw-r--r--arch/ia64/defconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 7539e83bf054..9997ef45ab23 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -638,6 +638,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
638CONFIG_SERIAL_CORE=y 638CONFIG_SERIAL_CORE=y
639CONFIG_SERIAL_CORE_CONSOLE=y 639CONFIG_SERIAL_CORE_CONSOLE=y
640CONFIG_SERIAL_SGI_L1_CONSOLE=y 640CONFIG_SERIAL_SGI_L1_CONSOLE=y
641CONFIG_SERIAL_SGI_IOC4=y
641CONFIG_UNIX98_PTYS=y 642CONFIG_UNIX98_PTYS=y
642CONFIG_LEGACY_PTYS=y 643CONFIG_LEGACY_PTYS=y
643CONFIG_LEGACY_PTY_COUNT=256 644CONFIG_LEGACY_PTY_COUNT=256
@@ -943,6 +944,11 @@ CONFIG_INFINIBAND_IPOIB=m
943# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 944# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
944 945
945# 946#
947# SN Devices
948#
949CONFIG_SGI_IOC4=y
950
951#
946# File systems 952# File systems
947# 953#
948CONFIG_EXT2_FS=y 954CONFIG_EXT2_FS=y