diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-06-28 18:54:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-12 16:05:48 -0700 |
| commit | 6e2338992c5a7d0711ce09f1d1b79a1a27d37bca (patch) | |
| tree | 52da32a558c4f59416cb6657fa9bf2acdbf3130d /arch | |
| parent | 155dbfd8846bf165bb036c4492ad121c8b059f1d (diff) | |
| download | linux-3.10-6e2338992c5a7d0711ce09f1d1b79a1a27d37bca.tar.gz linux-3.10-6e2338992c5a7d0711ce09f1d1b79a1a27d37bca.tar.bz2 linux-3.10-6e2338992c5a7d0711ce09f1d1b79a1a27d37bca.zip | |
[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')
| -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 c624b61e110..0a362e3aeac 100644 --- a/arch/i386/pci/common.c +++ b/arch/i386/pci/common.c @@ -17,10 +17,6 @@ #include "pci.h" -#ifdef CONFIG_PCI_BIOS -extern void pcibios_sort(void); -#endif - unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | PCI_PROBE_MMCONF; diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 12bf3d8dda2..bf4e7933538 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, extern void pci_direct_init(void); extern void pci_pcbios_init(void); extern void pci_mmcfg_init(void); - +extern void pcibios_sort(void); |