Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub...

[sfrench/cifs-2.6.git] / arch / x86 / xen / setup.c

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 95fb68a8c20d5260b1f20f4ad8f3b91148d917fe..b5a7f928234b064b34a0b9d2c8d2f9d869e7c635 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -23,7 +23,6 @@
 #include <xen/interface/callback.h>
 #include <xen/interface/memory.h>
 #include <xen/interface/physdev.h>
-#include <xen/interface/memory.h>
 #include <xen/features.h>
 
 #include "xen-ops.h"