diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-28 12:54:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-12 19:05:48 -0400 |
commit | 6e2338992c5a7d0711ce09f1d1b79a1a27d37bca (patch) | |
tree | 52da32a558c4f59416cb6657fa9bf2acdbf3130d /arch/i386/pci | |
parent | 155dbfd8846bf165bb036c4492ad121c8b059f1d (diff) |
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
This patch adds a proper prototype for pcibios_sort() in
arch/i386/pci/pci.h.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/i386/pci')
-rw-r--r-- | arch/i386/pci/common.c | 4 | ||||
-rw-r--r-- | arch/i386/pci/pci.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c index c624b61e1104..0a362e3aeac5 100644 --- a/arch/i386/pci/common.c +++ b/arch/i386/pci/common.c | |||
@@ -17,10 +17,6 @@ | |||
17 | 17 | ||
18 | #include "pci.h" | 18 | #include "pci.h" |
19 | 19 | ||
20 | #ifdef CONFIG_PCI_BIOS | ||
21 | extern void pcibios_sort(void); | ||
22 | #endif | ||
23 | |||
24 | unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | | 20 | unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | |
25 | PCI_PROBE_MMCONF; | 21 | PCI_PROBE_MMCONF; |
26 | 22 | ||
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 12bf3d8dda29..bf4e79335388 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h | |||
@@ -84,4 +84,4 @@ extern int pci_conf1_read(unsigned int seg, unsigned int bus, | |||
84 | extern void pci_direct_init(void); | 84 | extern void pci_direct_init(void); |
85 | extern void pci_pcbios_init(void); | 85 | extern void pci_pcbios_init(void); |
86 | extern void pci_mmcfg_init(void); | 86 | extern void pci_mmcfg_init(void); |
87 | 87 | extern void pcibios_sort(void); | |