diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-04-27 17:18:21 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 18:02:00 +1000 |
commit | e10fa77368dff31140451fac04d78d9f51f0f3ac (patch) | |
tree | 20f3645859dbd995ded831f5a40b78e823e4fc6e /include/asm-powerpc | |
parent | 95a1ca6cd8e702a19ee56efae522a5816a56a205 (diff) | |
download | kernel_samsung_tuna-e10fa77368dff31140451fac04d78d9f51f0f3ac.zip kernel_samsung_tuna-e10fa77368dff31140451fac04d78d9f51f0f3ac.tar.gz kernel_samsung_tuna-e10fa77368dff31140451fac04d78d9f51f0f3ac.tar.bz2 |
[PATCH] powerpc: use the device tree for the iSeries vio bus probe
As an added bonus, since every vio_dev now has a device_node
associated with it, hotplug now works.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/vio.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h index 0544ece..0055d8e 100644 --- a/include/asm-powerpc/vio.h +++ b/include/asm-powerpc/vio.h @@ -66,8 +66,7 @@ struct vio_driver { struct vio_bus_ops { int (*match)(const struct vio_device_id *id, const struct vio_dev *dev); - void (*unregister_device)(struct vio_dev *); - void (*release_device)(struct device *); + struct iommu_table *(*build_iommu_table)(struct vio_dev *dev); }; extern struct dma_mapping_ops vio_dma_ops; @@ -82,14 +81,14 @@ extern void __devinit vio_unregister_device(struct vio_dev *dev); extern int vio_bus_init(struct vio_bus_ops *); -#ifdef CONFIG_PPC_PSERIES struct device_node; extern struct vio_dev * __devinit vio_register_device_node( struct device_node *node_vdev); -extern struct vio_dev *vio_find_node(struct device_node *vnode); -extern const void *vio_get_attribute(struct vio_dev *vdev, void *which, +extern const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length); +#ifdef CONFIG_PPC_PSERIES +extern struct vio_dev *vio_find_node(struct device_node *vnode); extern int vio_enable_interrupts(struct vio_dev *dev); extern int vio_disable_interrupts(struct vio_dev *dev); #endif |