diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2004-06-29 05:17:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-29 05:17:49 -0700 |
| commit | 4575edd5da76ec5325f1f882d342845fcbbdc475 (patch) | |
| tree | c8c0924de4c61d8d29af8add146a48cefec0ba3a /include | |
| parent | f62ae1202d731aff04b70a5331999176878f0938 (diff) | |
[PATCH] ppc64: vio infrastructure modifications
The intention here is to have no effect on pSeries except:
1) vio_register_device is renamed to vio_register_device_node to better
reflect is purpose and to allow me to introduce
vio_register_device_iseries.
2) I have introduced the name and type fields in struct vio_dev to make
these two fields independent of subarchitecture.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/vio.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h index 36fc9f9d1f1c..3fd465c9263d 100644 --- a/include/asm-ppc64/vio.h +++ b/include/asm-ppc64/vio.h @@ -14,6 +14,7 @@ #ifndef _ASM_VIO_H #define _ASM_VIO_H +#include <linux/config.h> #include <linux/init.h> #include <linux/errno.h> #include <linux/device.h> @@ -44,7 +45,10 @@ struct iommu_table; int vio_register_driver(struct vio_driver *drv); void vio_unregister_driver(struct vio_driver *drv); -struct vio_dev * __devinit vio_register_device(struct device_node *node_vdev); +#ifdef CONFIG_PPC_PSERIES +struct vio_dev * __devinit vio_register_device_node( + struct device_node *node_vdev); +#endif void __devinit vio_unregister_device(struct vio_dev *dev); struct vio_dev *vio_find_node(struct device_node *vnode); @@ -108,6 +112,8 @@ static inline struct vio_driver *to_vio_driver(struct device_driver *drv) */ struct vio_dev { struct iommu_table *iommu_table; /* vio_map_* uses this */ + char *name; + char *type; uint32_t unit_address; unsigned int irq; |