diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/configs/sn2_defconfig | 6 | ||||
-rw-r--r-- | arch/ia64/defconfig | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 6ff7107fee4d..a01bb02d074d 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
@@ -588,6 +588,7 @@ CONFIG_SGI_MBCS=m | |||
588 | CONFIG_SERIAL_CORE=y | 588 | CONFIG_SERIAL_CORE=y |
589 | CONFIG_SERIAL_CORE_CONSOLE=y | 589 | CONFIG_SERIAL_CORE_CONSOLE=y |
590 | CONFIG_SERIAL_SGI_L1_CONSOLE=y | 590 | CONFIG_SERIAL_SGI_L1_CONSOLE=y |
591 | CONFIG_SERIAL_SGI_IOC4=y | ||
591 | CONFIG_UNIX98_PTYS=y | 592 | CONFIG_UNIX98_PTYS=y |
592 | CONFIG_LEGACY_PTYS=y | 593 | CONFIG_LEGACY_PTYS=y |
593 | CONFIG_LEGACY_PTY_COUNT=256 | 594 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -788,6 +789,11 @@ CONFIG_INFINIBAND_IPOIB=m | |||
788 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | 789 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set |
789 | 790 | ||
790 | # | 791 | # |
792 | # SN Devices | ||
793 | # | ||
794 | CONFIG_SGI_IOC4=y | ||
795 | |||
796 | # | ||
791 | # File systems | 797 | # File systems |
792 | # | 798 | # |
793 | CONFIG_EXT2_FS=y | 799 | CONFIG_EXT2_FS=y |
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 | |||
638 | CONFIG_SERIAL_CORE=y | 638 | CONFIG_SERIAL_CORE=y |
639 | CONFIG_SERIAL_CORE_CONSOLE=y | 639 | CONFIG_SERIAL_CORE_CONSOLE=y |
640 | CONFIG_SERIAL_SGI_L1_CONSOLE=y | 640 | CONFIG_SERIAL_SGI_L1_CONSOLE=y |
641 | CONFIG_SERIAL_SGI_IOC4=y | ||
641 | CONFIG_UNIX98_PTYS=y | 642 | CONFIG_UNIX98_PTYS=y |
642 | CONFIG_LEGACY_PTYS=y | 643 | CONFIG_LEGACY_PTYS=y |
643 | CONFIG_LEGACY_PTY_COUNT=256 | 644 | CONFIG_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 | # | ||
949 | CONFIG_SGI_IOC4=y | ||
950 | |||
951 | # | ||
946 | # File systems | 952 | # File systems |
947 | # | 953 | # |
948 | CONFIG_EXT2_FS=y | 954 | CONFIG_EXT2_FS=y |