From 03e3bb0bd13656ce556287c22701e0b1d73e8a42 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 16:57:49 +0100
Subject: [PATCH] --- yaml --- r: 136630 b: refs/heads/master c:
 72ee6ebbb3fe1ac23d1a669b177b858d2028bf09 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 40a93a1b3534..6bb36bf34aa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61b8172e57c4b8db1fcb7f5fd8dfda85ffd8e052
+refs/heads/master: 72ee6ebbb3fe1ac23d1a669b177b858d2028bf09
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index f983f4055b18..ae37a7504b57 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1873,8 +1873,7 @@ config EISA
 source "drivers/eisa/Kconfig"
 
 config MCA
-	bool "MCA support" if !X86_VOYAGER
-	default y if X86_VOYAGER
+	bool "MCA support"
 	help
 	  MicroChannel Architecture is found in some IBM PS/2 machines and
 	  laptops.  It is a bus system similar to PCI or ISA. See