[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-1444e0c9daf0d3472677efc15588b192fc2db761@git.kernel.org>
Date: Wed, 23 Feb 2011 12:09:00 GMT
From: tip-bot for Henrik Kretzschmar <henne@...htwindheim.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, henne@...htwindheim.de, mingo@...e.hu
Subject: [tip:x86/apic] x86: Fix deps of X86_UP_IOAPIC
Commit-ID: 1444e0c9daf0d3472677efc15588b192fc2db761
Gitweb: http://git.kernel.org/tip/1444e0c9daf0d3472677efc15588b192fc2db761
Author: Henrik Kretzschmar <henne@...htwindheim.de>
AuthorDate: Tue, 22 Feb 2011 15:38:07 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 23 Feb 2011 11:38:46 +0100
x86: Fix deps of X86_UP_IOAPIC
Since commit 7cd92366a593246650cc7d6198e2c7d3af8c1d8a
lAPIC enabled accidently the IOAPIC, which now gets fixed.
Signed-off-by: Henrik Kretzschmar <henne@...htwindheim.de>
LKML-Reference: <1298385487-4708-5-git-send-email-henne@...htwindheim.de>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d5ed94d..867a8cf 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -811,7 +811,7 @@ config X86_LOCAL_APIC
config X86_IO_APIC
def_bool y
- depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
+ depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC
config X86_VISWS_APIC
def_bool y
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists