[kernel] r7533 - in dists/trunk/linux-2.6/debian/arch: arm armeb hppa i386 sparc

[Bastian Blank]

Author: waldi
Date: Tue Sep 26 19:47:36 2006
New Revision: 7533

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32

Log:
debian/arch/arm: Unify io scheduler settings.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Tue Sep 26 19:47:36 2006
@@ -53,19 +53,6 @@
 #
 
 #
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
 # System Type
 #
 # CONFIG_ARCH_CLPS7500 is not set

Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	Tue Sep 26 19:47:36 2006
@@ -58,19 +58,6 @@
 #
 
 #
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
 # System Type
 #
 # CONFIG_ARCH_CLPS7500 is not set

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Tue Sep 26 19:47:36 2006
@@ -102,10 +102,6 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
 CONFIG_ATA_OVER_ETH=m
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem	Tue Sep 26 19:47:36 2006
@@ -1,9 +1,6 @@
 CONFIG_LOCK_KERNEL=y
 # CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
-# CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_M386 is not set
 CONFIG_M686=y
 # CONFIG_MK7 is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32	Tue Sep 26 19:47:36 2006
@@ -56,19 +56,6 @@
 #
 
 #
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
 # General machine setup
 #
 # CONFIG_SMP is not set