git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-ppc64
/
vio.h
diff --git
a/include/asm-ppc64/vio.h
b/include/asm-ppc64/vio.h
index
36fc9f9
..
3fd465c
100644
(file)
--- a/
include/asm-ppc64/vio.h
+++ b/
include/asm-ppc64/vio.h
@@
-14,6
+14,7
@@
#ifndef _ASM_VIO_H
#define _ASM_VIO_H
#ifndef _ASM_VIO_H
#define _ASM_VIO_H
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/device.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);
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);
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 */
*/
struct vio_dev {
struct iommu_table *iommu_table; /* vio_map_* uses this */
+ char *name;
+ char *type;
uint32_t unit_address;
unsigned int irq;
uint32_t unit_address;
unsigned int irq;