diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
| commit | 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d (patch) | |
| tree | 8e2db4ba9263e92d264ef469c7dac28078f63874 /include/asm-sparc64/vdev.h | |
| parent | 9bf2aa129a107a0e9e2a5318d35aca731ae7e666 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-sparc64/vdev.h')
| -rw-r--r-- | include/asm-sparc64/vdev.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-sparc64/vdev.h b/include/asm-sparc64/vdev.h index 996e6be7b976..25637c57675d 100644 --- a/include/asm-sparc64/vdev.h +++ b/include/asm-sparc64/vdev.h | |||
| @@ -7,10 +7,11 @@ | |||
| 7 | #define _SPARC64_VDEV_H | 7 | #define _SPARC64_VDEV_H |
| 8 | 8 | ||
| 9 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 10 | #include <asm/prom.h> | ||
| 10 | 11 | ||
| 11 | extern u32 sun4v_vdev_devhandle; | 12 | extern u32 sun4v_vdev_devhandle; |
| 12 | extern int sun4v_vdev_root; | 13 | extern struct device_node *sun4v_vdev_root; |
| 13 | 14 | ||
| 14 | extern unsigned int sun4v_vdev_device_interrupt(unsigned int); | 15 | extern unsigned int sun4v_vdev_device_interrupt(struct device_node *dev_node); |
| 15 | 16 | ||
| 16 | #endif /* !(_SPARC64_VDEV_H) */ | 17 | #endif /* !(_SPARC64_VDEV_H) */ |