[kernel] r7532 - dists/trunk/linux-2.6/debian/arch

[Bastian Blank]

Author: waldi
Date: Tue Sep 26 19:46:27 2006
New Revision: 7532

Modified:
   dists/trunk/linux-2.6/debian/arch/config

Log:
debian/arch/config: Make cfq io scheduler the default.


Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Tue Sep 26 19:46:27 2006
@@ -32,6 +32,10 @@
 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_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