diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-18 03:13:38 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-18 03:13:38 +0000 |
| commit | 287638b2c533165c3c03dfa15196c2ba583cd287 (patch) | |
| tree | e753dd2cd7421a26e179c43d7f6d4d39541a4afb /arch/ia64/include/asm | |
| parent | f6c43385435640e056424034caac0d765c45e370 (diff) | |
| parent | a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/include/asm')
| -rw-r--r-- | arch/ia64/include/asm/fpu.h | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/xen/hypervisor.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h index 0c26157cffa..b6395ad1500 100644 --- a/arch/ia64/include/asm/fpu.h +++ b/arch/ia64/include/asm/fpu.h @@ -6,6 +6,8 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ +#include <linux/types.h> + /* floating point status register: */ #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */ #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */ diff --git a/arch/ia64/include/asm/xen/hypervisor.h b/arch/ia64/include/asm/xen/hypervisor.h index e425227a418..88afb54501e 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 */ |