diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /arch/i386/pci/pci.h | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/i386/pci/pci.h')
| -rw-r--r-- | arch/i386/pci/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index a8fc80ca69f3..a80f0f55ff51 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #define PCI_ASSIGN_ALL_BUSSES 0x4000 | 27 | #define PCI_ASSIGN_ALL_BUSSES 0x4000 |
| 28 | 28 | ||
| 29 | extern unsigned int pci_probe; | 29 | extern unsigned int pci_probe; |
| 30 | extern unsigned long pirq_table_addr; | ||
| 30 | 31 | ||
| 31 | /* pci-i386.c */ | 32 | /* pci-i386.c */ |
| 32 | 33 | ||