diff options
| author | Dmitry Torokhov | 2016-12-16 18:31:17 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2016-12-16 18:31:17 +0100 |
| commit | f26e8817b235d8764363bffcc9cbfc61867371f2 (patch) | |
| tree | 6546ea2cf91b78f1ada2161db61e21085c880740 /fs/xfs/xfs_ioctl.h | |
| parent | Input: change KEY_DATA from 0x275 to 0x277 (diff) | |
| parent | Merge branch 'synaptics-rmi4' into next (diff) | |
| download | kernel-qcow2-linux-f26e8817b235d8764363bffcc9cbfc61867371f2.tar.gz kernel-qcow2-linux-f26e8817b235d8764363bffcc9cbfc61867371f2.tar.xz kernel-qcow2-linux-f26e8817b235d8764363bffcc9cbfc61867371f2.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.10 merge window.
Diffstat (limited to 'fs/xfs/xfs_ioctl.h')
| -rw-r--r-- | fs/xfs/xfs_ioctl.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h index 77c02c7900b6..8b52881bfd90 100644 --- a/fs/xfs/xfs_ioctl.h +++ b/fs/xfs/xfs_ioctl.h @@ -20,10 +20,7 @@ extern int xfs_ioc_space( - struct xfs_inode *ip, - struct inode *inode, struct file *filp, - int ioflags, unsigned int cmd, xfs_flock64_t *bf); |