linux-next: manual merge of the staging tree with the fbdev tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/xgifb/XGI_main_26.c between commit 0d5c6ca30bb0
("staging: xgifb: use display information in info not in var for
panning") from the fbdev tree and commit fd26d42019cb ("staging: xgifb:
avoid direct references xgi_video_info") from the staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88ad,36db231..0000000
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1300,8 +1300,8 @@@ static int XGIfb_do_set_var(struct fb_v
  	return 0;
  }
  
- #ifdef XGIFB_PAN
- static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info,
 -			 struct fb_var_screeninfo *var)
++			 struct fb_var_screeninfo *var, struct fb_info *info)
  {
  	unsigned int base;
  
@@@ -1686,7 -1634,7 +1624,7 @@@ static int XGIfb_pan_display(struct fb_
  						> info->var.yres_virtual)
  			return -EINVAL;
  	}
- 	err = XGIfb_pan_var(var, info);
 -	err = XGIfb_pan_var(xgifb_info, var);
++	err = XGIfb_pan_var(xgifb_info, var, info);
  	if (err < 0)
  		return err;

Attachment: pgp00000.pgp
Description: PGP signature