From 179d4c8efb692f2392b0d1395732c1c4dd047f1c Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 17 Oct 2012 09:39:15 +0100
Subject: [PATCH] --- yaml --- r: 334788 b: refs/heads/master c:
 ee678518eb386f513ac7fd374f7e8b8792ee79f8 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/xen/balloon.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 008198c6862d..c49629dcd218 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef32f89298c094b6ed76c0c4981b7a51e939cb71
+refs/heads/master: ee678518eb386f513ac7fd374f7e8b8792ee79f8
diff --git a/trunk/drivers/xen/balloon.c b/trunk/drivers/xen/balloon.c
index 31ab82fda38a..d7bd1b323775 100644
--- a/trunk/drivers/xen/balloon.c
+++ b/trunk/drivers/xen/balloon.c
@@ -55,7 +55,6 @@
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/tlb.h>
-#include <asm/e820.h>
 
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>