diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 18:57:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 18:57:32 -0400 |
| commit | 7efe5d7c3e3a82e43b0f8fb29c6797317bce7a9a (patch) | |
| tree | 2e246004dfc130947574e340a4968239b3f2d20b /drivers/pci/pci.h | |
| parent | dbe0580d0d2fccf63b0349840a7ae3dbb16f3074 (diff) | |
| parent | f8977d0a9b7ac84cfe700278a2ca64cb33c93a13 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d3f3dd42240d..6527b36c9a61 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -15,6 +15,13 @@ extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, | |||
| 15 | extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); | 15 | extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); |
| 16 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state); | 16 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state); |
| 17 | 17 | ||
| 18 | extern int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val); | ||
| 19 | extern int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val); | ||
| 20 | extern int pci_user_read_config_dword(struct pci_dev *dev, int where, u32 *val); | ||
| 21 | extern int pci_user_write_config_byte(struct pci_dev *dev, int where, u8 val); | ||
| 22 | extern int pci_user_write_config_word(struct pci_dev *dev, int where, u16 val); | ||
| 23 | extern int pci_user_write_config_dword(struct pci_dev *dev, int where, u32 val); | ||
| 24 | |||
| 18 | /* PCI /proc functions */ | 25 | /* PCI /proc functions */ |
| 19 | #ifdef CONFIG_PROC_FS | 26 | #ifdef CONFIG_PROC_FS |
| 20 | extern int pci_proc_attach_device(struct pci_dev *dev); | 27 | extern int pci_proc_attach_device(struct pci_dev *dev); |