diff options
| author | Paul Mackerras | 2006-02-28 06:35:24 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2006-02-28 06:35:24 +0100 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /include/asm-powerpc | |
| parent | powerpc: Export variables used in conversions to/from cputime_t (diff) | |
| parent | [PATCH] powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping (diff) | |
| download | kernel-qcow2-linux-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.gz kernel-qcow2-linux-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.xz kernel-qcow2-linux-6749c5507388f3fc3719f57a54b540ee83f6661a.zip | |
Merge ../powerpc-merge
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/eeh.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-powerpc/eeh.h b/include/asm-powerpc/eeh.h index b263fb2fa6e4..7dfb408fe2ca 100644 --- a/include/asm-powerpc/eeh.h +++ b/include/asm-powerpc/eeh.h @@ -27,6 +27,7 @@ #include <linux/string.h> struct pci_dev; +struct pci_bus; struct device_node; #ifdef CONFIG_EEH @@ -61,7 +62,7 @@ void __init pci_addr_cache_build(void); */ void eeh_add_device_early(struct device_node *); void eeh_add_device_tree_early(struct device_node *); -void eeh_add_device_late(struct pci_dev *); +void eeh_add_device_tree_late(struct pci_bus *); /** * eeh_remove_device - undo EEH setup for the indicated pci device @@ -116,12 +117,12 @@ static inline void pci_addr_cache_build(void) { } static inline void eeh_add_device_early(struct device_node *dn) { } -static inline void eeh_add_device_late(struct pci_dev *dev) { } - static inline void eeh_remove_device(struct pci_dev *dev) { } static inline void eeh_add_device_tree_early(struct device_node *dn) { } +static inline void eeh_add_device_tree_late(struct pci_bus *bus) { } + static inline void eeh_remove_bus_device(struct pci_dev *dev) { } #define EEH_POSSIBLE_ERROR(val, type) (0) #define EEH_IO_ERROR_VALUE(size) (-1UL) |