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

This commit is contained in:
Ingo Molnar
2008-07-08 07:47:47 +02:00
1169 changed files with 27617 additions and 11786 deletions

View File

@@ -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 */