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

From: Randy Dunlap
Date: Thu Apr 02 2009 - 11:31:20 EST


From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

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 <randy.dunlap@xxxxxxxxxx>
---
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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/