From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Aug 2011 04:05:29 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20110831~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94a0905e819a858876209aa8929905a1337b4d31;p=karo-tx-linux.git

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/rtl8192e/r8192E_core.c
	drivers/staging/xgifb/XGI_main_26.c
---

94a0905e819a858876209aa8929905a1337b4d31
diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88add9520,7b36b7ea4640..5c6bae48799c
--- 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;