diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 05:24:41 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 05:24:41 +0300 |
| commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
| tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /drivers/infiniband | |
| parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
| download | linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.xz | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_file_ops.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c index 6d7f453b4d05..aed8afee56da 100644 --- a/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c @@ -40,7 +40,6 @@ #include <linux/slab.h> #include <linux/highmem.h> #include <linux/io.h> -#include <linux/aio.h> #include <linux/jiffies.h> #include <linux/cpu.h> #include <asm/pgtable.h> diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c index 41937c6f888a..14046f5a37fa 100644 --- a/drivers/infiniband/hw/qib/qib_file_ops.c +++ b/drivers/infiniband/hw/qib/qib_file_ops.c @@ -39,7 +39,6 @@ #include <linux/vmalloc.h> #include <linux/highmem.h> #include <linux/io.h> -#include <linux/aio.h> #include <linux/jiffies.h> #include <asm/pgtable.h> #include <linux/delay.h> |