summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorSam Ravnborg2007-11-06 23:10:39 +0100
committerSam Ravnborg2007-11-12 21:02:19 +0100
commitbc0120fdb4798421a577630bf5cbd77fc2d6661d (patch)
tree792540ac97e36c94635bbaf429caa99d64308615 /arch/x86/Kconfig
parentx86: add X86_64 dependency to x86_64 specific symbols in Kconfig.x86_64 (diff)
downloadkernel-qcow2-linux-bc0120fdb4798421a577630bf5cbd77fc2d6661d.tar.gz
kernel-qcow2-linux-bc0120fdb4798421a577630bf5cbd77fc2d6661d.tar.xz
kernel-qcow2-linux-bc0120fdb4798421a577630bf5cbd77fc2d6661d.zip
x86: copy x86_64 specific Kconfig symbols to Kconfig.i386
No functional changes. A prepatory step towards full unification. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e741fc772da5..9fbb049950d1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -353,11 +353,11 @@ config GEODE_MFGPT_TIMER
MFGPTs have a better resolution and max interval than the
generic PIT, and are suitable for use as high-res timers.
+endif # X86_32
+
config K8_NB
def_bool y
- depends on AGP_AMD64
-
-endif # X86_32
+ depends on AGP_AMD64 || (X86_64 && (GART_IOMMU || (PCI && NUMA)))
source "drivers/pcmcia/Kconfig"