diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:17:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:17:41 -0700 |
| commit | d3745f46e32d86de188cf378f923b7a2ed5274f9 (patch) | |
| tree | b6ad64cbd41644de503a15ce3669e00ec602db8f /arch/i386/pci/common.c | |
| parent | 70d002bccac5e107fafb95e83fcb7fc010a88695 (diff) | |
| parent | ffadcc2ff42ecedf71ea67d9051ff028927aed08 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD
* HEAD:
[PATCH] PCI: PCIE power management quirk
[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
Diffstat (limited to 'arch/i386/pci/common.c')
| -rw-r--r-- | arch/i386/pci/common.c | 4 |
1 files changed, 0 insertions, 4 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; |