diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-17 11:15:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-17 11:15:00 -0700 |
| commit | a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232 (patch) | |
| tree | ad9ed53d30b54141d99a67c90eefdd3a4a0d83dc /arch/ia64/include/asm/xen/hypervisor.h | |
| parent | 499ee0710f9881423d807c6ecc451c5e1bd5ff62 (diff) | |
| parent | 18282b36d742347abd9a4bc74fe9fd2432a8335b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"
Add dma_debug_init() for ia64
Fix ia64 compilation IS_ERR and PTE_ERR errors.
Diffstat (limited to 'arch/ia64/include/asm/xen/hypervisor.h')
| -rw-r--r-- | arch/ia64/include/asm/xen/hypervisor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/xen/hypervisor.h b/arch/ia64/include/asm/xen/hypervisor.h index e425227a418e..88afb54501e4 100644 --- a/arch/ia64/include/asm/xen/hypervisor.h +++ b/arch/ia64/include/asm/xen/hypervisor.h @@ -33,6 +33,7 @@ #ifndef _ASM_IA64_XEN_HYPERVISOR_H #define _ASM_IA64_XEN_HYPERVISOR_H +#include <linux/err.h> #include <xen/interface/xen.h> #include <xen/interface/version.h> /* to compile feature.c */ #include <xen/features.h> /* to comiple xen-netfront.c */ |