diff options
| author | Tony Luck <aegl@agluck-lia64.sc.intel.com> | 2004-09-21 19:48:58 +0000 |
|---|---|---|
| committer | Tony Luck <aegl@agluck-lia64.sc.intel.com> | 2004-09-21 19:48:58 +0000 |
| commit | 67da3ff694367abfb568415f2e2a7933dbaaccd0 (patch) | |
| tree | b8e497a5f958e52271d984aac47e200909b97401 /arch | |
| parent | fea568db2f96d54266d52b1a82a61966d2306337 (diff) | |
| parent | dc161f148ad4a1d72cab31fcf7034611f9ad9c16 (diff) | |
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/sgi
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/configs/sn2_defconfig | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index c2a336c8fde7..032fd4ef4444 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.9-rc1 -# Fri Aug 27 22:00:00 2004 +# Linux kernel version: 2.6.9-rc2 +# Fri Sep 17 13:58:32 2004 # # @@ -13,6 +13,7 @@ CONFIG_CLEAN_COMPILE=y # # General setup # +CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -33,6 +34,8 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SHMEM=y +# CONFIG_TINY_SHMEM is not set # # Loadable module support @@ -54,6 +57,7 @@ CONFIG_MMU=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_TIME_INTERPOLATION=y CONFIG_EFI=y +CONFIG_GENERIC_IOMAP=y # CONFIG_IA64_GENERIC is not set # CONFIG_IA64_DIG is not set # CONFIG_IA64_HP_ZX1 is not set @@ -210,7 +214,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set @@ -277,7 +280,8 @@ CONFIG_SCSI_FC_ATTRS=y # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_MEGARAID is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set CONFIG_SCSI_SATA=y # CONFIG_SCSI_SATA_SVW is not set # CONFIG_SCSI_ATA_PIIX is not set @@ -334,8 +338,7 @@ CONFIG_DM_ZERO=m # Fusion MPT device support # CONFIG_FUSION=y -CONFIG_FUSION_MAX_SGE=40 -CONFIG_FUSION_ISENSE=m +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m # @@ -550,7 +553,6 @@ CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_QIC02_TAPE is not set # # IPMI @@ -575,6 +577,7 @@ CONFIG_EFI_RTC=y CONFIG_RAW_DRIVER=m # CONFIG_HPET is not set CONFIG_MAX_RAW_DEVS=256 +CONFIG_MMTIMER=y # # I2C support |