diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-04-27 03:23:32 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 04:02:02 -0400 |
commit | c7f0e8cb5654a50986c6097b3c0cca972e406899 (patch) | |
tree | dc8a8e590c5cf97d8b7cae2f1e93bdbef178f89f /include/asm-powerpc/vio.h | |
parent | dd721ffd95d5e1516380da0b254ef737582a258f (diff) |
[PATCH] powerpc: merge the rest of the vio code
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/vio.h')
-rw-r--r-- | include/asm-powerpc/vio.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h index 9c09a8ffa128..10da7f3af938 100644 --- a/include/asm-powerpc/vio.h +++ b/include/asm-powerpc/vio.h | |||
@@ -64,22 +64,14 @@ struct vio_driver { | |||
64 | struct device_driver driver; | 64 | struct device_driver driver; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | struct vio_bus_ops { | ||
68 | struct iommu_table *(*build_iommu_table)(struct vio_dev *dev); | ||
69 | }; | ||
70 | |||
71 | extern struct dma_mapping_ops vio_dma_ops; | 67 | extern struct dma_mapping_ops vio_dma_ops; |
72 | extern struct bus_type vio_bus_type; | 68 | extern struct bus_type vio_bus_type; |
73 | extern struct vio_dev vio_bus_device; | ||
74 | 69 | ||
75 | extern int vio_register_driver(struct vio_driver *drv); | 70 | extern int vio_register_driver(struct vio_driver *drv); |
76 | extern void vio_unregister_driver(struct vio_driver *drv); | 71 | extern void vio_unregister_driver(struct vio_driver *drv); |
77 | 72 | ||
78 | extern struct vio_dev * __devinit vio_register_device(struct vio_dev *viodev); | ||
79 | extern void __devinit vio_unregister_device(struct vio_dev *dev); | 73 | extern void __devinit vio_unregister_device(struct vio_dev *dev); |
80 | 74 | ||
81 | extern int vio_bus_init(struct vio_bus_ops *); | ||
82 | |||
83 | struct device_node; | 75 | struct device_node; |
84 | 76 | ||
85 | extern struct vio_dev * __devinit vio_register_device_node( | 77 | extern struct vio_dev * __devinit vio_register_device_node( |