summaryrefslogtreecommitdiffstats
path: root/arch/arm/xen/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-14 22:17:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-14 22:17:40 -0700
commit882ebfc28c389be86535bda4a7d9e407020356bf (patch)
treee8f3ddeda13196f40040f3ba4701ece5d38c63cc /arch/arm/xen/Makefile
parent1c84cd48a117486166f3597c081b170b76e5bd81 (diff)
parent9e82bf014195d6f0054982c463575cdce24292be (diff)
downloadlinux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.bz2
Merge 3.17-rc5 into tty-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/xen/Makefile')
-rw-r--r--arch/arm/xen/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/xen/Makefile b/arch/arm/xen/Makefile
index 12969523414c..1f85bfe6b470 100644
--- a/arch/arm/xen/Makefile
+++ b/arch/arm/xen/Makefile
@@ -1 +1 @@
-obj-y := enlighten.o hypercall.o grant-table.o p2m.o mm.o
+obj-y := enlighten.o hypercall.o grant-table.o p2m.o mm.o mm32.o