summaryrefslogtreecommitdiff
path: root/arch/x86/xen/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 08:35:53 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 08:35:53 +0900
commit8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47 (patch)
treee1680876ad4a0267868efc855f070549274f147f /arch/x86/xen/setup.c
parentc12ae95ccc2dc80b4bd57363240cdb6eab2adcbc (diff)
parente6d4a76dbf2ff27314e09291dfb9e4afcb9ecd60 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: remove duplicated #include xen: x86/32: perform initial startup on initial_page_table
Diffstat (limited to 'arch/x86/xen/setup.c')
-rw-r--r--arch/x86/xen/setup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 38fdffaa71d3..01afd8a94607 100644
--- 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"