---

yaml --- r: 136646 b: refs/heads/master c: 7cd9236 h: refs/heads/master v: v3
git-mirror · Jan 29, 2009 · c3784e5 · c3784e5
1 parent 7f69d16
commit c3784e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3e6a2042fef33b747d2ae3961f5312af801973d
+refs/heads/master: 7cd92366a593246650cc7d6198e2c7d3af8c1d8a
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -642,7 +642,7 @@ source "kernel/Kconfig.preempt"
 
 config X86_UP_APIC
 	bool "Local APIC support on uniprocessors"
-	depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH)
+	depends on X86_32 && !SMP && !X86_GENERICARCH
 	help
 	  A local APIC (Advanced Programmable Interrupt Controller) is an
 	  integrated interrupt controller in the CPU. If you have a single-CPU
@@ -667,11 +667,11 @@ config X86_UP_IOAPIC
 
 config X86_LOCAL_APIC
 	def_bool y
-	depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
+	depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC
 
 config X86_IO_APIC
 	def_bool y
-	depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
+	depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC
 
 config X86_VISWS_APIC
 	def_bool y