Merge commit 'v2.6.26-rc9' into x86/cpu

[linux-2.6-omap-h63xx.git] / arch / x86 / pci / pci.h

diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index fd53db50eeeb0f6c1f5af35adf6d0163bbcf8c88..ba263e626a68762bf4e4c470fe325fa01c4f45ee 100644 (file)
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -102,7 +102,7 @@ extern struct pci_raw_ops pci_direct_conf1;
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_olpc_init(void);
+extern int pci_olpc_init(void);
 
 /* pci-mmconfig.c */