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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/xgifb/XGI_main_26.c between commit c42a3d543d2b
("staging: xgifb: use display information in info not in var for
panning") from the fbdev tree and commit c39aada6926c ("staging: xgifb:
eliminate #ifdef XGIFB_PAN") from the staging tree.

Just context changes.  I fixed it up (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,4415d4a..0000000
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1357,7 +1357,7 @@@ static int XGIfb_do_set_var(struct fb_v
  	return 0;
  }
  
- #ifdef XGIFB_PAN
 -static int XGIfb_pan_var(struct fb_var_screeninfo *var)
 +static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
  {
  	unsigned int base;
  
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux