diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
| commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
| tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /include/linux/rio_drv.h | |
| parent | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
| download | linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.gz linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.bz2 linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/rio_drv.h')
| -rw-r--r-- | include/linux/rio_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h index 3bd7cce19e26..f54772d0e7f8 100644 --- a/include/linux/rio_drv.h +++ b/include/linux/rio_drv.h @@ -21,6 +21,7 @@ #include <linux/list.h> #include <linux/errno.h> #include <linux/device.h> +#include <linux/string.h> #include <linux/rio.h> extern int __rio_local_read_config_32(struct rio_mport *port, u32 offset, @@ -336,8 +337,8 @@ static inline void rio_init_dbell_res(struct resource *res, u16 start, u16 end) /** * RIO_DEVICE - macro used to describe a specific RIO device - * @vid: the 16 bit RIO vendor ID - * @did: the 16 bit RIO device ID + * @dev: the 16 bit RIO device ID + * @ven: the 16 bit RIO vendor ID * * This macro is used to create a struct rio_device_id that matches a * specific device. The assembly vendor and assembly device fields |