From bd282364be57026bcb28101b23da95e866dbd6a6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 26 Sep 2006 19:46:27 +0000 Subject: [PATCH] debian/arch/config: Make cfq io scheduler the default. svn path=/dists/trunk/linux-2.6/; revision=7532 --- debian/arch/config | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/arch/config b/debian/arch/config index 768d88b8b..98b216e96 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -32,6 +32,10 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m CONFIG_MD_LINEAR=m @@ -622,18 +626,13 @@ CONFIG_SCSI_SATA_INTEL_COMBINED=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_SECURITY_NETWORK=y CONFIG_XFS_QUOTA=y -# CONFIG_DEFAULT_NOOP is not set CONFIG_MTD_ONENAND_VERIFY_WRITE=y -# CONFIG_DEFAULT_DEADLINE is not set CONFIG_INFINIBAND_SRP=m CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y -CONFIG_DEFAULT_IOSCHED="anticipatory" -CONFIG_DEFAULT_AS=y # CONFIG_JFFS2_SUMMARY is not set CONFIG_SCSI_SATA_SIL24=m CONFIG_MTD_ONENAND=m CONFIG_PPP_MPPE=m -# CONFIG_DEFAULT_CFQ is not set CONFIG_SCSI_PDC_ADMA=m CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y