diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 16:13:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 16:13:30 +1100 |
| commit | e97d4e4491ebe4752260ae15d931a5bb4fc9b4c7 (patch) | |
| tree | d20c4d3b2b0a9da5edce31e0c0f132d5e32edecd /include/linux | |
| parent | 46cbfd4a65a58bed4f6960e6bafd43c11336008e (diff) | |
| parent | 0d0f660d882c1c02748ced13966a2413aa5d6cc2 (diff) | |
Merge remote-tracking branch 'target-updates/for-next'
Conflicts:
drivers/scsi/qla2xxx/qla_target.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/uio_driver.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h index 1ad4724458de..baa81718d985 100644 --- a/include/linux/uio_driver.h +++ b/include/linux/uio_driver.h @@ -63,7 +63,17 @@ struct uio_port { #define MAX_UIO_PORT_REGIONS 5 -struct uio_device; +struct uio_device { + struct module *owner; + struct device *dev; + int minor; + atomic_t event; + struct fasync_struct *async_queue; + wait_queue_head_t wait; + struct uio_info *info; + struct kobject *map_dir; + struct kobject *portio_dir; +}; /** * struct uio_info - UIO device capabilities |