From bunk@stusta.de Wed Jun 28 09:54:50 2006 Date: Wed, 28 Jun 2006 18:54:33 +0200 From: Adrian Bunk To: gregkh@suse.de Cc: linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz Subject: PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort() Message-ID: <20060628165433.GN13915@stusta.de> Content-Disposition: inline This patch adds a proper prototype for pcibios_sort() in arch/i386/pci/pci.h. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman --- arch/i386/pci/common.c | 4 ---- arch/i386/pci/pci.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) --- gregkh-2.6.orig/arch/i386/pci/common.c +++ gregkh-2.6/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; --- gregkh-2.6.orig/arch/i386/pci/pci.h +++ gregkh-2.6/arch/i386/pci/pci.h @@ -84,4 +84,4 @@ extern int pci_conf1_read(unsigned int s extern void pci_direct_init(void); extern void pci_pcbios_init(void); extern void pci_mmcfg_init(void); - +extern void pcibios_sort(void);