diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:40:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:40:35 -0400 |
| commit | 9262e9149f346a5443300f8c451b8e7631e81a42 (patch) | |
| tree | f21b2d6f9270c7d0ff807f070e38d0f665582f21 /include | |
| parent | e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb (diff) | |
| parent | 6e990b50ed0b45d506ff6809034508d3e210497d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Kill sun4v virtual device layer.
[SERIAL] sunhv: Convert to of_driver layer.
[SPARC64]: Mask out top 8-bits in physical address when building resources.
[SERIAL] sunsu: Missing return statement in su_probe().
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/vdev.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/asm-sparc64/vdev.h b/include/asm-sparc64/vdev.h deleted file mode 100644 index 25637c57675d..000000000000 --- a/include/asm-sparc64/vdev.h +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | /* vdev.h: SUN4V virtual device interfaces and defines. | ||
| 2 | * | ||
| 3 | * Copyright (C) 2006 David S. Miller <davem@davemloft.net> | ||
| 4 | */ | ||
| 5 | |||
| 6 | #ifndef _SPARC64_VDEV_H | ||
| 7 | #define _SPARC64_VDEV_H | ||
| 8 | |||
| 9 | #include <linux/types.h> | ||
| 10 | #include <asm/prom.h> | ||
| 11 | |||
| 12 | extern u32 sun4v_vdev_devhandle; | ||
| 13 | extern struct device_node *sun4v_vdev_root; | ||
| 14 | |||
| 15 | extern unsigned int sun4v_vdev_device_interrupt(struct device_node *dev_node); | ||
| 16 | |||
| 17 | #endif /* !(_SPARC64_VDEV_H) */ | ||