diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-13 12:53:17 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-13 12:53:17 -0800 |
| commit | 8960f8c8e779fa405f031ca6866d6d3ab88e2eae (patch) | |
| tree | b0ad8fa2e78ed5bb065e8bc0ccb1fb877aede54f /arch/powerpc/include/asm/spu_info.h | |
| parent | 9b3651cbc26cfcea8276ecaff66718ea087f2e91 (diff) | |
| parent | 22796b15725488002437ebbf98a22fdbe596cf89 (diff) | |
Merge commit 'tip/x86/headers' into x86/untangle2
* commit 'tip/x86/headers': (42 commits)
x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
headers_check fix: linux/in6.h
headers_check fix: linux/coda_psdev.h
headers_check fix: xtensa, swab.h
headers_check fix: powerpc, swab.h
headers_check fix: powerpc, spu_info.h
headers_check fix: powerpc, ps3fb.h
headers_check fix: powerpc, kvm.h
headers_check fix: powerpc, elf.h
...
Diffstat (limited to 'arch/powerpc/include/asm/spu_info.h')
| -rw-r--r-- | arch/powerpc/include/asm/spu_info.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/spu_info.h b/arch/powerpc/include/asm/spu_info.h index 3545efbf989..1286c823f0d 100644 --- a/arch/powerpc/include/asm/spu_info.h +++ b/arch/powerpc/include/asm/spu_info.h @@ -23,9 +23,10 @@ #ifndef _SPU_INFO_H #define _SPU_INFO_H +#include <linux/types.h> + #ifdef __KERNEL__ #include <asm/spu.h> -#include <linux/types.h> #else struct mfc_cq_sr { __u64 mfc_cq_data0_RW; |