Subject: [PATCH] x86: fix build error when CONFIG_K8_NB=n

From: Randy Dunlap <[email-masked]>
Date: Thu, 02 Apr 2009 08:29:41 -0700

From: Randy Dunlap <[email-masked]>

Fix build error when CONFIG_K8_NB=n:

arch/x86/mm/built-in.o:(.bss+0x5c0): multiple definition of `k8_northbridges'
arch/x86/kernel/built-in.o:(.bss+0x18c8): first defined here

Signed-off-by: Randy Dunlap <[email-masked]>
---
 arch/x86/include/asm/k8.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20090402.orig/arch/x86/include/asm/k8.h
+++ linux-next-20090402/arch/x86/include/asm/k8.h
@@ -9,7 +9,7 @@ extern int early_is_k8_nb(u32 value);
 #ifdef CONFIG_K8_NB
 extern struct pci_dev **k8_northbridges;
 #else
-struct pci_dev **k8_northbridges;
+static struct pci_dev **k8_northbridges;
 #endif
 extern int num_k8_northbridges;
 extern int cache_k8_northbridges(void);