diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-07 12:27:23 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-07 12:27:23 -0800 |
commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /include/xen/grant_table.h | |
parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
download | op-kernel-dev-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip op-kernel-dev-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.gz |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'include/xen/grant_table.h')
-rw-r--r-- | include/xen/grant_table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 6b99bfb..11e2dfc 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> |