diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
| commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
| tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /drivers/staging | |
| parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/unisys/include/timskmod.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h index 4019a0d63645..52648d4d9922 100644 --- a/drivers/staging/unisys/include/timskmod.h +++ b/drivers/staging/unisys/include/timskmod.h @@ -46,7 +46,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/fcntl.h> -#include <linux/aio.h> #include <linux/workqueue.h> #include <linux/kthread.h> #include <linux/seq_file.h> |