diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-12 05:27:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 05:27:22 -0400 |
| commit | bb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch) | |
| tree | e63681727543bcc3251bbc82b81a9cc822cc3f5e /arch/x86/pci/pci.h | |
| parent | 4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff) | |
| parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'arch/x86/pci/pci.h')
| -rw-r--r-- | arch/x86/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index f3972b12c60a..720c4c554534 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
| @@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1; | |||
| 101 | extern int pci_direct_probe(void); | 101 | extern int pci_direct_probe(void); |
| 102 | extern void pci_direct_init(int type); | 102 | extern void pci_direct_init(int type); |
| 103 | extern void pci_pcbios_init(void); | 103 | extern void pci_pcbios_init(void); |
| 104 | extern void pci_olpc_init(void); | 104 | extern int pci_olpc_init(void); |
| 105 | 105 | ||
| 106 | /* pci-mmconfig.c */ | 106 | /* pci-mmconfig.c */ |
| 107 | 107 | ||