Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[net-next-2.6.git] / arch / x86 / pci / pci.h

diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index 8ef86b5c37c85b4e50261700b84be10481ab6c29..c58805a92db5788e508482dd1579640c782750d0 100644 (file)
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -98,6 +98,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);
 
 /* pci-mmconfig.c */