summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 01:45:49 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 01:45:49 +0300
commit15c989d4d14b82f43cae7efc6a7794cdd556f274 (patch)
tree3f1a22991aacf42acaf56467cbe79897146d3e32 /drivers/char
parent4e3eaddd142e2142c048c5052a0a9d2604fccfc6 (diff)
parent0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 (diff)
downloadlinux-15c989d4d14b82f43cae7efc6a7794cdd556f274.tar.xz
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 'drivers/char')
-rw-r--r--drivers/char/agp/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 2fb3a480f6b0..4b66c69eaf57 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -57,7 +57,7 @@ config AGP_AMD
config AGP_AMD64
tristate "AMD Opteron/Athlon64 on-CPU GART support"
- depends on AGP && X86
+ depends on AGP && X86 && K8_NB
help
This option gives you AGP support for the GLX component of
X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.