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/include/asm/ps3fb.h | |
| 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/include/asm/ps3fb.h')
| -rw-r--r-- | arch/powerpc/include/asm/ps3fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |