diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-30 02:19:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-30 02:19:42 +0300 |
| commit | ad233aca21509d337c78d32a50d2116cd6943031 (patch) | |
| tree | 1ceb04275e48fdf51ebaeb4f47d48db5fc3c46da | |
| parent | 29737370120b0570ac52e334cfc4117d68b3d044 (diff) | |
| parent | 386744425e35e04984c6e741c7750fd6eef1a9df (diff) | |
| download | linux-ad233aca21509d337c78d32a50d2116cd6943031.tar.xz | |
Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb patchlet from Konrad Rzeszutek Wilk:
"One trivial patch.
Another patch (from Fengguang) is already in your tree courtesy of
Andrew Morton - but I would prefer not to rebase my tree. Hence the
diff is very small"
* 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: Make linux/swiotlb.h standalone includible
MAINTAINERS: add git URL for swiotlb
| -rw-r--r-- | include/linux/swiotlb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index e7a018eaf3a2..017fced60242 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -1,10 +1,13 @@ #ifndef __LINUX_SWIOTLB_H #define __LINUX_SWIOTLB_H +#include <linux/dma-direction.h> +#include <linux/init.h> #include <linux/types.h> struct device; struct dma_attrs; +struct page; struct scatterlist; extern int swiotlb_force; |