|
@@ -244,7 +244,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
static int bcm2708_fb_register(struct bcm2708_fb *fb)
|
|
|
--- a/drivers/video/fbdev/core/fbmem.c
|
|
|
+++ b/drivers/video/fbdev/core/fbmem.c
|
|
|
-@@ -1086,6 +1086,30 @@ fb_blank(struct fb_info *info, int blank
|
|
|
+@@ -1096,6 +1096,30 @@ fb_blank(struct fb_info *info, int blank
|
|
|
}
|
|
|
EXPORT_SYMBOL(fb_blank);
|
|
|
|
|
@@ -275,7 +275,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
|
|
unsigned long arg)
|
|
|
{
|
|
|
-@@ -1094,6 +1118,7 @@ static long do_fb_ioctl(struct fb_info *
|
|
|
+@@ -1104,6 +1128,7 @@ static long do_fb_ioctl(struct fb_info *
|
|
|
struct fb_fix_screeninfo fix;
|
|
|
struct fb_cmap cmap_from;
|
|
|
struct fb_cmap_user cmap;
|
|
@@ -283,7 +283,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
void __user *argp = (void __user *)arg;
|
|
|
long ret = 0;
|
|
|
|
|
|
-@@ -1169,6 +1194,15 @@ static long do_fb_ioctl(struct fb_info *
|
|
|
+@@ -1181,6 +1206,15 @@ static long do_fb_ioctl(struct fb_info *
|
|
|
unlock_fb_info(info);
|
|
|
console_unlock();
|
|
|
break;
|
|
@@ -299,7 +299,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
default:
|
|
|
lock_fb_info(info);
|
|
|
fb = info->fbops;
|
|
|
-@@ -1308,6 +1342,7 @@ static long fb_compat_ioctl(struct file
|
|
|
+@@ -1320,6 +1354,7 @@ static long fb_compat_ioctl(struct file
|
|
|
case FBIOPAN_DISPLAY:
|
|
|
case FBIOGET_CON2FBMAP:
|
|
|
case FBIOPUT_CON2FBMAP:
|