diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 15:18:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 15:31:07 +1100 |
| commit | 9c9ce516d8594d02b113cd27b92b15b272e13859 (patch) | |
| tree | 426456b03bf50eb440da78bbc471ed408443e868 /drivers/infiniband/hw/qib/qib_file_ops.c | |
| parent | 5e73a53613dab2589117c595acafa1b8c682e951 (diff) | |
| parent | cc321d523dc4a7e0e1a4adaa70342f1ca9af2964 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_file_ops.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_file_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c index 4f7aa301b3b1..b56c9428f3c5 100644 --- a/drivers/infiniband/hw/qib/qib_file_ops.c +++ b/drivers/infiniband/hw/qib/qib_file_ops.c @@ -39,7 +39,7 @@ #include <linux/vmalloc.h> #include <linux/highmem.h> #include <linux/io.h> -#include <linux/uio.h> +#include <linux/aio.h> #include <linux/jiffies.h> #include <asm/pgtable.h> #include <linux/delay.h> |