diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /include/asm-powerpc/eeh.h | |
parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-powerpc/eeh.h')
-rw-r--r-- | include/asm-powerpc/eeh.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/eeh.h b/include/asm-powerpc/eeh.h index 7dfb408fe2ca..5207758a6dd9 100644 --- a/include/asm-powerpc/eeh.h +++ b/include/asm-powerpc/eeh.h | |||
@@ -61,6 +61,7 @@ void __init pci_addr_cache_build(void); | |||
61 | * to finish the eeh setup for this device. | 61 | * to finish the eeh setup for this device. |
62 | */ | 62 | */ |
63 | void eeh_add_device_early(struct device_node *); | 63 | void eeh_add_device_early(struct device_node *); |
64 | void eeh_add_device_late(struct pci_dev *dev); | ||
64 | void eeh_add_device_tree_early(struct device_node *); | 65 | void eeh_add_device_tree_early(struct device_node *); |
65 | void eeh_add_device_tree_late(struct pci_bus *); | 66 | void eeh_add_device_tree_late(struct pci_bus *); |
66 | 67 | ||
@@ -117,6 +118,8 @@ static inline void pci_addr_cache_build(void) { } | |||
117 | 118 | ||
118 | static inline void eeh_add_device_early(struct device_node *dn) { } | 119 | static inline void eeh_add_device_early(struct device_node *dn) { } |
119 | 120 | ||
121 | static inline void eeh_add_device_late(struct pci_dev *dev) { } | ||
122 | |||
120 | static inline void eeh_remove_device(struct pci_dev *dev) { } | 123 | static inline void eeh_remove_device(struct pci_dev *dev) { } |
121 | 124 | ||
122 | static inline void eeh_add_device_tree_early(struct device_node *dn) { } | 125 | static inline void eeh_add_device_tree_early(struct device_node *dn) { } |