aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/rio.h
diff options
context:
space:
mode:
authorMatt Porter <mporter@kernel.crashing.org>2005-11-07 04:00:18 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:46 -0500
commitfa78cc51794912b7e6ee98cd823fcc84cf79d04a (patch)
tree89366fdfc1c1cd48923c72464f38d8d1e2321f6b /include/linux/rio.h
parenteb188d0e857c436b5d365d5ccc629da5a06ed102 (diff)
[PATCH] rapidio: core updates
Addresses issues raised with the 2.6.12-rc6-mm1 RIO support. Fix dma_mask init, shrink some code, general cleanup. Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/rio.h')
-rw-r--r--include/linux/rio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 930bbb7c3802..5c29f2f477c2 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -91,6 +91,7 @@ struct rio_mport;
91 * @swpinfo: Switch port info 91 * @swpinfo: Switch port info
92 * @src_ops: Source operation capabilities 92 * @src_ops: Source operation capabilities
93 * @dst_ops: Destination operation capabilities 93 * @dst_ops: Destination operation capabilities
94 * @dma_mask: Mask of bits of RIO address this device implements
94 * @rswitch: Pointer to &struct rio_switch if valid for this device 95 * @rswitch: Pointer to &struct rio_switch if valid for this device
95 * @driver: Driver claiming this device 96 * @driver: Driver claiming this device
96 * @dev: Device model device 97 * @dev: Device model device
@@ -112,6 +113,7 @@ struct rio_dev {
112 u32 swpinfo; /* Only used for switches */ 113 u32 swpinfo; /* Only used for switches */
113 u32 src_ops; 114 u32 src_ops;
114 u32 dst_ops; 115 u32 dst_ops;
116 u64 dma_mask;
115 struct rio_switch *rswitch; /* RIO switch info */ 117 struct rio_switch *rswitch; /* RIO switch info */
116 struct rio_driver *driver; /* RIO driver claiming this device */ 118 struct rio_driver *driver; /* RIO driver claiming this device */
117 struct device dev; /* LDM device structure */ 119 struct device dev; /* LDM device structure */