diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-06 11:07:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-06 11:07:08 -0700 |
| commit | 9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce (patch) | |
| tree | 6ff139aff1cf8a00cc057b7a706a81d91ee639ca /include/media | |
| parent | 38c23685b273cfb4ccf31a199feccce3bdcb5d83 (diff) | |
| parent | 0e11f6443f522f89509495b13ef1f3745640144d (diff) | |
| download | linux-9022ca6b1129da44e3d5c4fa779b8bb9ceabe2ce.tar.bz2 | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff, including Christoph's I_DIRTY patches"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: move I_DIRTY_INODE to fs.h
ubifs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
ntfs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
gfs2: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) calls
fs: fold open_check_o_direct into do_dentry_open
vfs: Replace stray non-ASCII homoglyph characters with their ASCII equivalents
vfs: make sure struct filename->iname is word-aligned
get rid of pointless includes of fs_struct.h
[poll] annotate SAA6588_CMD_POLL users
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/i2c/saa6588.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/i2c/saa6588.h b/include/media/i2c/saa6588.h index b5ec1aa60ed5..a0825f532f71 100644 --- a/include/media/i2c/saa6588.h +++ b/include/media/i2c/saa6588.h @@ -32,6 +32,7 @@ struct saa6588_command { unsigned char __user *buffer; struct file *instance; poll_table *event_list; + __poll_t poll_mask; }; /* These ioctls are internal to the kernel */ |