diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 14:45:49 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 14:45:49 -0800 |
commit | 15c989d4d14b82f43cae7efc6a7794cdd556f274 (patch) | |
tree | 3f1a22991aacf42acaf56467cbe79897146d3e32 /arch/x86/Kconfig | |
parent | 4e3eaddd142e2142c048c5052a0a9d2604fccfc6 (diff) | |
parent | 0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 (diff) | |
download | linux-15c989d4d14b82f43cae7efc6a7794cdd556f274.tar.gz linux-15c989d4d14b82f43cae7efc6a7794cdd556f274.tar.bz2 linux-15c989d4d14b82f43cae7efc6a7794cdd556f274.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems
x86, UV: Fix target_cpus() in x2apic_uv_x.c
x86: Reduce per cpu warning boot up messages
x86: Reduce per cpu MCA boot up messages
x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 93936de67796..0eacb1ffb421 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -662,7 +662,7 @@ config GART_IOMMU bool "GART IOMMU support" if EMBEDDED default y select SWIOTLB - depends on X86_64 && PCI + depends on X86_64 && PCI && K8_NB ---help--- Support for full DMA access of devices with 32bit memory access only on systems with more than 3GB. This is usually needed for USB, @@ -2061,7 +2061,7 @@ endif # X86_32 config K8_NB def_bool y - depends on AGP_AMD64 || (X86_64 && (GART_IOMMU || (PCI && NUMA))) + depends on CPU_SUP_AMD && PCI source "drivers/pcmcia/Kconfig" |