Commit 19d4808f authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] Fix compile on PPC

At the moment the aty128fb and matroxfb frame buffer drivers don't
compile on PPC.  In both cases the error is pretty trivial.  This
patch is the minimum change to fix the problems.

The _IOR() type problem fix in aty128fb.c depends on the fact that the
size of a pointer is the same as "size_t", so we don't have to use
_IOR_BAD() to keep the ioctl number the same.
parent ebf7c862
...@@ -2041,9 +2041,9 @@ aty128fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, ...@@ -2041,9 +2041,9 @@ aty128fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
#define ATY_MIRROR_CRT_ON 0x00000002 #define ATY_MIRROR_CRT_ON 0x00000002
/* out param: u32* backlight value: 0 to 15 */ /* out param: u32* backlight value: 0 to 15 */
#define FBIO_ATY128_GET_MIRROR _IOR('@', 1, sizeof(__u32*)) #define FBIO_ATY128_GET_MIRROR _IOR('@', 1, __u32*)
/* in param: u32* backlight value: 0 to 15 */ /* in param: u32* backlight value: 0 to 15 */
#define FBIO_ATY128_SET_MIRROR _IOW('@', 2, sizeof(__u32*)) #define FBIO_ATY128_SET_MIRROR _IOW('@', 2, __u32*)
static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd, static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
u_long arg, struct fb_info *info) u_long arg, struct fb_info *info)
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#if defined(CONFIG_PPC_PMAC) #if defined(CONFIG_PPC_PMAC)
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <video/macmodes.h> #include "../macmodes.h"
#endif #endif
/* always compile support for 32MB... It cost almost nothing */ /* always compile support for 32MB... It cost almost nothing */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment