diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-21 14:21:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-21 14:21:48 +1000 |
| commit | 2de9fbeb71337f01e6d39d4f7e88b18331d8072f (patch) | |
| tree | 2506ea195f38e2134e5a4ffa0cf1419c1659a531 /lib/swiotlb.c | |
| parent | 122c21ba3895dd0603ae537cf2e1a032315ed02a (diff) | |
| parent | e63576bf0ba71c93e8cec28d48bc0350a20d2097 (diff) | |
Merge remote-tracking branch 'block/for-next'
Conflicts:
MAINTAINERS
arch/cris/include/asm/Kbuild
arch/um/include/asm/Kbuild
drivers/block/nvme-core.c
drivers/md/dm.c
include/linux/blkdev.h
mm/backing-dev.c
mm/page-writeback.c
Diffstat (limited to 'lib/swiotlb.c')
| -rw-r--r-- | lib/swiotlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 3c365ab6cf5f..9f85a7e22bc4 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -29,10 +29,10 @@ #include <linux/ctype.h> #include <linux/highmem.h> #include <linux/gfp.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/scatterlist.h> #include <linux/init.h> #include <linux/bootmem.h> |