diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/pci/pci.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 08d58fc78ee1..6bf327db5c5e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -42,7 +42,7 @@ extern void pci_remove_legacy_files(struct pci_bus *bus); | |||
| 42 | /* Lock for read/write access to pci device and bus lists */ | 42 | /* Lock for read/write access to pci device and bus lists */ |
| 43 | extern struct rw_semaphore pci_bus_sem; | 43 | extern struct rw_semaphore pci_bus_sem; |
| 44 | 44 | ||
| 45 | #ifdef CONFIG_X86_IO_APIC | 45 | #ifdef CONFIG_PCI_MSI |
| 46 | extern int pci_msi_quirk; | 46 | extern int pci_msi_quirk; |
| 47 | #else | 47 | #else |
| 48 | #define pci_msi_quirk 0 | 48 | #define pci_msi_quirk 0 |