diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 02:35:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 02:35:53 +0300 |
| commit | 8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47 (patch) | |
| tree | e1680876ad4a0267868efc855f070549274f147f /arch/x86/xen/setup.c | |
| parent | c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc (diff) | |
| parent | e6d4a76dbf2ff27314e09291dfb9e4afcb9ecd60 (diff) | |
| download | linux-8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47.tar.xz | |
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.c | 1 |
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" |