From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Sep 2011 05:35:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20110929~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b8349dac813bdf2f16dfbe623a90a700eb2a21e;p=karo-tx-linux.git

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

Conflicts:
	drivers/misc/altera-stapl/altera.c
	drivers/staging/comedi/drivers/ni_labpc.c
	drivers/staging/rtl8192e/r8192E_core.c
	drivers/staging/xgifb/XGI_main_26.c
---

8b8349dac813bdf2f16dfbe623a90a700eb2a21e
diff --cc drivers/misc/altera-stapl/altera.c
index 1a2c50b82f94,c2eff6a82db1..24272e022bec
--- a/drivers/misc/altera-stapl/altera.c
+++ b/drivers/misc/altera-stapl/altera.c
@@@ -28,7 -28,8 +28,8 @@@
  #include <linux/string.h>
  #include <linux/firmware.h>
  #include <linux/slab.h>
+ #include <linux/module.h>
 -#include "altera.h"
 +#include <misc/altera.h>
  #include "altera-exprt.h"
  #include "altera-jtag.h"
  
diff --cc drivers/staging/hv/Makefile
index 14e3c6a14ea4,bd176b1f231e..3e0d7e6edf49
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,6 -1,5 +1,5 @@@
 -obj-$(CONFIG_HYPERV)		+= hv_vmbus.o hv_timesource.o
 +obj-$(CONFIG_HYPERV)		+= hv_vmbus.o
  obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
- obj-$(CONFIG_HYPERV_BLOCK)	+= hv_blkvsc.o
  obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
  obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
  obj-$(CONFIG_HYPERV_MOUSE)	+= hv_mouse.o
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;