diff options
author | Matt Porter <mporter@kernel.crashing.org> | 2005-11-07 01:00:18 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 07:53:46 -0800 |
commit | fa78cc51794912b7e6ee98cd823fcc84cf79d04a (patch) | |
tree | 89366fdfc1c1cd48923c72464f38d8d1e2321f6b /include/linux/rio.h | |
parent | eb188d0e857c436b5d365d5ccc629da5a06ed102 (diff) | |
download | linux-stable-fa78cc51794912b7e6ee98cd823fcc84cf79d04a.tar.gz linux-stable-fa78cc51794912b7e6ee98cd823fcc84cf79d04a.tar.bz2 linux-stable-fa78cc51794912b7e6ee98cd823fcc84cf79d04a.zip |
[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.h | 2 |
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; * @swpinfo: Switch port info * @src_ops: Source operation capabilities * @dst_ops: Destination operation capabilities + * @dma_mask: Mask of bits of RIO address this device implements * @rswitch: Pointer to &struct rio_switch if valid for this device * @driver: Driver claiming this device * @dev: Device model device @@ -112,6 +113,7 @@ struct rio_dev { u32 swpinfo; /* Only used for switches */ u32 src_ops; u32 dst_ops; + u64 dma_mask; struct rio_switch *rswitch; /* RIO switch info */ struct rio_driver *driver; /* RIO driver claiming this device */ struct device dev; /* LDM device structure */ |