diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 21:14:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 21:14:30 -0700 |
| commit | b79675e15a754ca51b9fc631e0961ccdd4ec3fc7 (patch) | |
| tree | 7df53cef573ef848ba5005475d66dae47ee3cde1 /drivers/dma | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | fs: define inode flags using bit numbers (diff) | |
| download | wireguard-linux-b79675e15a754ca51b9fc631e0961ccdd4ec3fc7.tar.xz wireguard-linux-b79675e15a754ca51b9fc631e0961ccdd4ec3fc7.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"No common topic whatsoever in those, sorry"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: define inode flags using bit numbers
iov_iter: Move unnecessary inclusion of crypto/hash.h
dlmfs: clean up dlmfs_file_{read,write}() a bit
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/sf-pdma/sf-pdma.c | 1 | ||||
| -rw-r--r-- | drivers/dma/st_fdma.c | 1 | ||||
| -rw-r--r-- | drivers/dma/uniphier-xdmac.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c index 5c118c7e02bd..6e530dca6d9e 100644 --- a/drivers/dma/sf-pdma/sf-pdma.c +++ b/drivers/dma/sf-pdma/sf-pdma.c @@ -20,6 +20,7 @@ #include <linux/mod_devicetable.h> #include <linux/dma-mapping.h> #include <linux/of.h> +#include <linux/slab.h> #include "sf-pdma.h" diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c index 67087dbe2f9f..962b6e05287b 100644 --- a/drivers/dma/st_fdma.c +++ b/drivers/dma/st_fdma.c @@ -15,6 +15,7 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/remoteproc.h> +#include <linux/slab.h> #include "st_fdma.h" diff --git a/drivers/dma/uniphier-xdmac.c b/drivers/dma/uniphier-xdmac.c index 7b2f8a8c2d31..16b19654873d 100644 --- a/drivers/dma/uniphier-xdmac.c +++ b/drivers/dma/uniphier-xdmac.c @@ -12,6 +12,7 @@ #include <linux/of.h> #include <linux/of_dma.h> #include <linux/platform_device.h> +#include <linux/slab.h> #include "dmaengine.h" #include "virt-dma.h" |