summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-02-09 20:44:08 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-02-09 20:44:08 +0300
commit3e5e692fcd6ce0d63d8c9bd8677d9aaeec61d70e (patch)
tree98af3e020479a18dfe4726085a8c113135749e1e /arch
parent46c291e277f93737877305f5626a2c5c35522cb1 (diff)
parent9ab7d228e972b50d06ee28076ab5d0f93e862463 (diff)
downloadlinux-3e5e692fcd6ce0d63d8c9bd8677d9aaeec61d70e.tar.xz
Merge tag 'for-linus-5.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross: "Two very minor fixes: one remove of a #include for an unused header and a fix of the xen ML address in MAINTAINERS" * tag 'for-linus-5.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: MAINTAINERS: unify reference to xen-devel list arch/arm/xen: Remove duplicate header
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/xen/mm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index cb44aa290e73..e1d44b903dfc 100644
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -7,7 +7,6 @@
#include <linux/of_address.h>
#include <linux/slab.h>
#include <linux/types.h>
-#include <linux/dma-mapping.h>
#include <linux/vmalloc.h>
#include <linux/swiotlb.h>