diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:07:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:07:22 -0700 |
| commit | 742b0c905d970fd60893cce14a3c68b523504bc4 (patch) | |
| tree | d85689d464a8b11efe7fb6ff2f2151c4c4974871 /include | |
| parent | 235bd6140dad7c08261abdc1f8056485c5344a74 (diff) | |
| parent | 9171078ab5a0bbb516029cfc61378e0350a7b30d (diff) | |
| download | linux-stable-742b0c905d970fd60893cce14a3c68b523504bc4.tar.gz linux-stable-742b0c905d970fd60893cce14a3c68b523504bc4.tar.bz2 linux-stable-742b0c905d970fd60893cce14a3c68b523504bc4.zip | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6.git/
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3c89148ae28a..b5238bd18830 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -671,6 +671,7 @@ struct pci_driver { int (*suspend) (struct pci_dev *dev, pm_message_t state); /* Device suspended */ int (*resume) (struct pci_dev *dev); /* Device woken up */ int (*enable_wake) (struct pci_dev *dev, pci_power_t state, int enable); /* Enable wake event */ + void (*shutdown) (struct pci_dev *dev); struct device_driver driver; struct pci_dynids dynids; @@ -810,7 +811,6 @@ void pci_set_master(struct pci_dev *dev); int pci_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); int pci_set_dma_mask(struct pci_dev *dev, u64 mask); -int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask); int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); int pci_assign_resource(struct pci_dev *dev, int i); @@ -941,7 +941,6 @@ static inline void pci_set_master(struct pci_dev *dev) { } static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } static inline void pci_disable_device(struct pci_dev *dev) { } static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } -static inline int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} static inline int pci_register_driver(struct pci_driver *drv) { return 0;} static inline void pci_unregister_driver(struct pci_driver *drv) { } |