summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 18:31:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 18:31:36 -0800
commit06d381484fe8fb1ba2996c22e89595a273e3634c (patch)
tree0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0 /include
parent5d5a8d2d9d6cca979efe4fe1552d787fdc542603 (diff)
parentc9d6369978411f690513994e6e53e2e6410874a4 (diff)
Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: net: xen-netback: use API provided by xenbus module to map rings block: xen-blkback: use API provided by xenbus module to map rings xen: use generic functions instead of xen_{alloc, free}_vm_area()
Diffstat (limited to 'include')
-rw-r--r--include/xen/grant_table.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 6b99bfbd785d..11e2dfce42f8 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -43,7 +43,6 @@
#include <xen/interface/grant_table.h>
#include <asm/xen/hypervisor.h>
-#include <asm/xen/grant_table.h>
#include <xen/features.h>