diff options
author | Len Brown <len.brown@intel.com> | 2006-01-28 01:18:29 +0300 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-28 01:18:29 +0300 |
commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /arch/ia64/configs/sn2_defconfig | |
parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
download | linux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz |
Pull release into acpica branch
Diffstat (limited to 'arch/ia64/configs/sn2_defconfig')
-rw-r--r-- | arch/ia64/configs/sn2_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index ff8bb3770c9d..3cb503b659e6 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -659,6 +659,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_SGI_L1_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_SERIAL_SGI_IOC4=y +CONFIG_SERIAL_SGI_IOC3=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -899,6 +900,7 @@ CONFIG_INFINIBAND_SRP=m # SN Devices # CONFIG_SGI_IOC4=y +CONFIG_SGI_IOC3=y # # File systems |