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/char | |
| parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/mem.c | 2 | ||||
| -rw-r--r-- | drivers/char/tile-srom.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 297110c12635..9c4fd7a8e2e5 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/pfn.h> | 26 | #include <linux/pfn.h> |
| 27 | #include <linux/export.h> | 27 | #include <linux/export.h> |
| 28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 29 | #include <linux/aio.h> | 29 | #include <linux/uio.h> |
| 30 | 30 | ||
| 31 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
| 32 | 32 | ||
diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c index 02e76ac6d282..69f6b4acc377 100644 --- a/drivers/char/tile-srom.c +++ b/drivers/char/tile-srom.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/types.h> /* size_t */ | 27 | #include <linux/types.h> /* size_t */ |
| 28 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
| 29 | #include <linux/fcntl.h> /* O_ACCMODE */ | 29 | #include <linux/fcntl.h> /* O_ACCMODE */ |
| 30 | #include <linux/aio.h> | ||
| 31 | #include <linux/pagemap.h> | 30 | #include <linux/pagemap.h> |
| 32 | #include <linux/hugetlb.h> | 31 | #include <linux/hugetlb.h> |
| 33 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |