diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
commit | d22a8ccff761c81f2930bd90fa5712e51a0e9a62 (patch) | |
tree | 52a92cf1b9a65e4440276706c4b4e879d4008a87 /arch/i386/pci/pci.h | |
parent | 783e3385a134305d49d7b431df6e591265e7ec14 (diff) | |
parent | 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/pci/pci.h')
-rw-r--r-- | arch/i386/pci/pci.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 127d53ad16be..f550781ec310 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h | |||
@@ -74,3 +74,10 @@ extern spinlock_t pci_config_lock; | |||
74 | 74 | ||
75 | extern int (*pcibios_enable_irq)(struct pci_dev *dev); | 75 | extern int (*pcibios_enable_irq)(struct pci_dev *dev); |
76 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); | 76 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); |
77 | |||
78 | extern int pci_conf1_write(unsigned int seg, unsigned int bus, | ||
79 | unsigned int devfn, int reg, int len, u32 value); | ||
80 | extern int pci_conf1_read(unsigned int seg, unsigned int bus, | ||
81 | unsigned int devfn, int reg, int len, u32 *value); | ||
82 | |||
83 | |||