[kernel] r10871 - in dists/trunk/linux-2.6/debian/config: arm m68k mips mipsel

[Bastian Blank]

Author: waldi
Date: Fri Mar 14 20:24:01 2008
New Revision: 10871

Log:
debian/config: Centralize IO Schedulers.


Modified:
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/m68k/config
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Fri Mar 14 20:24:01 2008
@@ -89,14 +89,6 @@
 CONFIG_CPU_TLB_V4WB=y
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_DES=y

Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile	Fri Mar 14 20:24:01 2008
@@ -119,21 +119,6 @@
 # CONFIG_BLK_DEV_BSG is not set
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-## choice: Default I/O scheduler
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-## end choice
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_XOR_BLOCKS=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config	Fri Mar 14 20:24:01 2008
@@ -9,14 +9,6 @@
 CONFIG_PROC_HARDWARE=y
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-
-##
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_BLK_DEV_COW_COMMON is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Fri Mar 14 20:24:01 2008
@@ -176,21 +176,6 @@
 # CONFIG_LSF is not set
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-## choice: Default I/O scheduler
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-## end choice
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO=y

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Fri Mar 14 20:24:01 2008
@@ -166,21 +166,6 @@
 # CONFIG_BLK_DEV_IO_TRACE is not set
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-## choice: Default I/O scheduler
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-## end choice
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO=y

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Fri Mar 14 20:24:01 2008
@@ -176,21 +176,6 @@
 # CONFIG_LSF is not set
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-## choice: Default I/O scheduler
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-## end choice
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO=y

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Fri Mar 14 20:24:01 2008
@@ -166,21 +166,6 @@
 # CONFIG_BLK_DEV_IO_TRACE is not set
 
 ##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-## choice: Default I/O scheduler
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-## end choice
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO=y