summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-01-23 12:33:59 +0100
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-08-20 15:58:29 -0700
commit2f3e897aedc8c2b2422e593b348b8878a5ac524b (patch)
tree7c8302d5d55182f8e610da39f4b27e9165f6a7ea
parentcf1d248310edf1ddfd7b1fbdb4549fdd47fa7077 (diff)
x86, mce: Make xeon75xx memory driver dependent on PCI
commit 757fd770c649b0dfa6eeefc2d5e2ea3119b6be9c upstream (linux-2.6-tip) Found by Ingo Molnar's automated tester. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andi Kleen <ak@linux.intel.com> LKML-Reference: <20100123113359.GA29555@one.firstfloor.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4dee38717efd..d01b38459a17 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -878,7 +878,7 @@ config X86_MCE_INTEL
config X86_MCE_XEON75XX
tristate "Intel Xeon 7500 series corrected memory error driver"
- depends on X86_MCE_INTEL
+ depends on X86_MCE_INTEL && PCI
---help---
Add support for a Intel Xeon 7500 series specific memory error driver.
This allows to report the DIMM and physical address on a corrected