diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 01:47:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 01:47:47 -0400 |
| commit | 93022136fff9e6130aa128a5ed8a599e93ac813c (patch) | |
| tree | 185390fb75a3d7423cc508610b76637c957205b9 /arch/x86/pci/pci.h | |
| parent | c49c412a47b5102516d3313d4eba38cb1e968721 (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge commit 'v2.6.26-rc9' into x86/cpu
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 fd53db50eeeb..ba263e626a68 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
| @@ -102,7 +102,7 @@ extern struct pci_raw_ops pci_direct_conf1; | |||
| 102 | extern int pci_direct_probe(void); | 102 | extern int pci_direct_probe(void); |
| 103 | extern void pci_direct_init(int type); | 103 | extern void pci_direct_init(int type); |
| 104 | extern void pci_pcbios_init(void); | 104 | extern void pci_pcbios_init(void); |
| 105 | extern void pci_olpc_init(void); | 105 | extern int pci_olpc_init(void); |
| 106 | 106 | ||
| 107 | /* pci-mmconfig.c */ | 107 | /* pci-mmconfig.c */ |
| 108 | 108 | ||