diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 12:19:24 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 12:19:24 +0200 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /arch/ia64/defconfig | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
| download | kernel_samsung_smdk4412-da04b128cf0d74dd4cab270c53d9264e70f9203e.tar.gz kernel_samsung_smdk4412-da04b128cf0d74dd4cab270c53d9264e70f9203e.tar.bz2 kernel_samsung_smdk4412-da04b128cf0d74dd4cab270c53d9264e70f9203e.zip | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/defconfig')
| -rw-r--r-- | arch/ia64/defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 7539e83bf05..9997ef45ab2 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -638,6 +638,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_SGI_L1_CONSOLE=y +CONFIG_SERIAL_SGI_IOC4=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -943,6 +944,11 @@ CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_DEBUG is not set # +# SN Devices +# +CONFIG_SGI_IOC4=y + +# # File systems # CONFIG_EXT2_FS=y |