summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2012-09-30 18:22:21 +0200
committerWilly Tarreau <w@1wt.eu>2012-10-07 23:37:18 +0200
commit46e8a56a531183b0f4ff5cb08d28c2660e60fab8 (patch)
tree222cc415bed6dc80e5e4d55c9d47bc6b5a8ea199 /arch
parent08dd6464bb0da8386733d7121b67bc896c9f84ba (diff)
PNP: fix "work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB"
Initial stable commit : 2215d91091c465fd58da7814d1c10e09ac2d8307 This patch backported into 2.6.32.55 is enabled when CONFIG_AMD_NB is set, but this config option does not exist in 2.6.32, it was called CONFIG_K8_NB, so the fix was never applied. Some other changes were needed to make it work. first, the correct include file name was asm/k8.h and not asm/amd_nb.h, and second, amd_get_mmconfig_range() is needed and was merged by previous patch. Thanks to Jiri Slabi who reported the issue and diagnosed all the dependencies. Signed-off-by: Willy Tarreau <w@1wt.eu> Cc: Jiri Slaby <jslaby@suse.cz> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/amd_bus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index cb34763ef217..aae9931d8297 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -3,6 +3,7 @@
#include <linux/topology.h>
#include <linux/cpu.h>
#include <asm/pci_x86.h>
+#include <asm/k8.h>
#ifdef CONFIG_X86_64
#include <asm/pci-direct.h>