diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/powerpc | |
parent | bf33a70a73876b163d62612e9567cbac6604ba7e (diff) | |
parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 (diff) |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/bootx.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/elf.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/kvm.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/ps3fb.h | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/spu_info.h | 3 | ||||
-rw-r--r-- | arch/powerpc/include/asm/swab.h | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/bootx.h b/arch/powerpc/include/asm/bootx.h index 57b82e3f89ce..60a3c9ef3017 100644 --- a/arch/powerpc/include/asm/bootx.h +++ b/arch/powerpc/include/asm/bootx.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #ifndef __ASM_BOOTX_H__ | 9 | #ifndef __ASM_BOOTX_H__ |
10 | #define __ASM_BOOTX_H__ | 10 | #define __ASM_BOOTX_H__ |
11 | 11 | ||
12 | #include <asm/types.h> | 12 | #include <linux/types.h> |
13 | 13 | ||
14 | #ifdef macintosh | 14 | #ifdef macintosh |
15 | #include <Types.h> | 15 | #include <Types.h> |
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index cd46f023ec6d..b5600ce6055e 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <asm/string.h> | 7 | #include <asm/string.h> |
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #include <asm/types.h> | 10 | #include <linux/types.h> |
11 | #include <asm/ptrace.h> | 11 | #include <asm/ptrace.h> |
12 | #include <asm/cputable.h> | 12 | #include <asm/cputable.h> |
13 | #include <asm/auxvec.h> | 13 | #include <asm/auxvec.h> |
diff --git a/arch/powerpc/include/asm/kvm.h b/arch/powerpc/include/asm/kvm.h index f993e4198d5c..4e0cf65f7f5a 100644 --- a/arch/powerpc/include/asm/kvm.h +++ b/arch/powerpc/include/asm/kvm.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef __LINUX_KVM_POWERPC_H | 20 | #ifndef __LINUX_KVM_POWERPC_H |
21 | #define __LINUX_KVM_POWERPC_H | 21 | #define __LINUX_KVM_POWERPC_H |
22 | 22 | ||
23 | #include <asm/types.h> | 23 | #include <linux/types.h> |
24 | 24 | ||
25 | struct kvm_regs { | 25 | struct kvm_regs { |
26 | __u64 pc; | 26 | __u64 pc; |
diff --git a/arch/powerpc/include/asm/ps3fb.h b/arch/powerpc/include/asm/ps3fb.h index 3f121fe4010d..e7233a849680 100644 --- a/arch/powerpc/include/asm/ps3fb.h +++ b/arch/powerpc/include/asm/ps3fb.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #ifndef _ASM_POWERPC_PS3FB_H_ | 19 | #ifndef _ASM_POWERPC_PS3FB_H_ |
20 | #define _ASM_POWERPC_PS3FB_H_ | 20 | #define _ASM_POWERPC_PS3FB_H_ |
21 | 21 | ||
22 | #include <linux/types.h> | ||
22 | #include <linux/ioctl.h> | 23 | #include <linux/ioctl.h> |
23 | 24 | ||
24 | /* ioctl */ | 25 | /* ioctl */ |
diff --git a/arch/powerpc/include/asm/spu_info.h b/arch/powerpc/include/asm/spu_info.h index 3545efbf9891..1286c823f0d8 100644 --- a/arch/powerpc/include/asm/spu_info.h +++ b/arch/powerpc/include/asm/spu_info.h | |||
@@ -23,9 +23,10 @@ | |||
23 | #ifndef _SPU_INFO_H | 23 | #ifndef _SPU_INFO_H |
24 | #define _SPU_INFO_H | 24 | #define _SPU_INFO_H |
25 | 25 | ||
26 | #include <linux/types.h> | ||
27 | |||
26 | #ifdef __KERNEL__ | 28 | #ifdef __KERNEL__ |
27 | #include <asm/spu.h> | 29 | #include <asm/spu.h> |
28 | #include <linux/types.h> | ||
29 | #else | 30 | #else |
30 | struct mfc_cq_sr { | 31 | struct mfc_cq_sr { |
31 | __u64 mfc_cq_data0_RW; | 32 | __u64 mfc_cq_data0_RW; |
diff --git a/arch/powerpc/include/asm/swab.h b/arch/powerpc/include/asm/swab.h index ef824ae4b79c..c581e3ef73ed 100644 --- a/arch/powerpc/include/asm/swab.h +++ b/arch/powerpc/include/asm/swab.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * 2 of the License, or (at your option) any later version. | 8 | * 2 of the License, or (at your option) any later version. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <asm/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
13 | 13 | ||
14 | #ifdef __GNUC__ | 14 | #ifdef __GNUC__ |