Merge branch 'devel' into for-linus

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / ps3fb.h

diff --git a/arch/powerpc/include/asm/ps3fb.h b/arch/powerpc/include/asm/ps3fb.h
index e7233a849680ce4595f8b9afc345593b9431d6ce..90dbefb8cfc4a01528c1700f123e870c160decab 100644 (file)
--- a/arch/powerpc/include/asm/ps3fb.h
+++ b/arch/powerpc/include/asm/ps3fb.h
@@ -21,6 +21,7 @@
 
 #include <linux/types.h>
 #include <linux/ioctl.h>
+#include <linux/types.h>
 
 /* ioctl */
 #define PS3FB_IOCTL_SETMODE       _IOW('r',  1, int) /* set video mode */