diff options
| author | Jan Beulich <jbeulich@suse.com> | 2011-11-15 14:47:41 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2011-11-15 14:47:41 +0100 |
| commit | 525848a54bd7c76fa59836231368465380909463 (patch) | |
| tree | c6b9e2df378ccf57f62bb85a487427cb9cf03e05 /xen/include/xen/efi.h | |
| parent | 0d20a8e3737ca73ffd793e502d1747b74ee5e3f0 (diff) | |
| download | xen-525848a54bd7c76fa59836231368465380909463.tar.gz xen-525848a54bd7c76fa59836231368465380909463.tar.bz2 xen-525848a54bd7c76fa59836231368465380909463.zip | |
ia64: fix the build
This addresses all remaining build problems introduced over the last
several months.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'xen/include/xen/efi.h')
| -rw-r--r-- | xen/include/xen/efi.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 0e871a72be..647dafc473 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -1,10 +1,12 @@ #ifndef __XEN_EFI_H__ #define __XEN_EFI_H__ +#ifndef __ASSEMBLY__ #include <xen/types.h> +#endif #if defined(__ia64__) -# #include <linux/efi.h> +# include_next <linux/efi.h> #else # if defined(__i386__) @@ -27,6 +29,8 @@ extern struct efi efi; #endif +#ifndef __ASSEMBLY__ + union xenpf_efi_info; union compat_pf_efi_info; @@ -44,4 +48,6 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *); int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *); int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *); +#endif /* !__ASSEMBLY__ */ + #endif /* __XEN_EFI_H__ */ |