From 593d1bd5e8c0cd50fa5d9ff51027b33beb959841 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 30 Jan 2008 13:32:49 +0100
Subject: [PATCH] --- yaml --- r: 80183 b: refs/heads/master c:
 a9a832902fccc958caa339677dbff766e51b02c3 h: refs/heads/master i:   80181:
 0724c7ac5a679b6ff8a8cfa05810da8df4b7656e   80179:
 64d3b2e6684adeab9597fa4146b5643d89d910af   80175:
 f38ae5705c09580b103f93e139e6ffb7855f32b3 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/configs/i386_defconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b69adf636d1..dbc59f97ecdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b68076fd5d7de04e6847ed9d7d212e7dd6beb5
+refs/heads/master: a9a832902fccc958caa339677dbff766e51b02c3
diff --git a/trunk/arch/x86/configs/i386_defconfig b/trunk/arch/x86/configs/i386_defconfig
index 54ee1764fdae..77562e7cdab6 100644
--- a/trunk/arch/x86/configs/i386_defconfig
+++ b/trunk/arch/x86/configs/i386_defconfig
@@ -99,9 +99,9 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"