From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Oct 2011 05:04:26 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20111006~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=610999d346ab9aceefbf1975063328e715025dba;p=karo-tx-linux.git

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

Conflicts:
	drivers/misc/altera-stapl/altera.c
	drivers/staging/brcm80211/brcmsmac/mac80211_if.c
	drivers/staging/comedi/drivers/ni_labpc.c
	drivers/staging/et131x/et1310_tx.c
	drivers/staging/rtl8192e/r8192E_core.c
	drivers/staging/xgifb/XGI_main_26.c
	drivers/staging/zram/zram_drv.c
---

610999d346ab9aceefbf1975063328e715025dba
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/et131x/et1310_tx.c
index 03e7a4ea510d,2ecb934a55b6..41618a69a924
--- a/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@@ -519,12 -392,12 +392,12 @@@ static int nic_send_packet(struct et131
  			 * returned by pci_map_page() is always 32-bit
  			 * addressable (as defined by the pci/dma subsystem)
  			 */
 -			desc[frag++].addr_lo =
 -			    pci_map_page(adapter->pdev,
 -					 frags[i - 1].page,
 -					 frags[i - 1].page_offset,
 -					 frags[i - 1].size,
 -					 PCI_DMA_TODEVICE);
 +			desc[frag++].addr_lo = skb_frag_dma_map(
- 							&etdev->pdev->dev,
++							&adapter->pdev->dev,
 +							&frags[i - 1],
 +							0,
 +							frags[i - 1].size,
 +							PCI_DMA_TODEVICE);
  		}
  	}
  
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,e6156f15f0bb..842ce55e737a
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1321,7 +1321,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;
  
diff --cc drivers/staging/zram/zram_drv.c
index 02589cab6710,b9926ee0052c..09de99fbb7e0
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -572,9 -573,18 +573,17 @@@ static void zram_make_request(struct re
  	}
  
  	__zram_make_request(zram, bio, bio_data_dir(bio));
+ 	up_read(&zram->init_lock);
+ 
 -	return 0;
++	return;
+ 
+ error_unlock:
+ 	up_read(&zram->init_lock);
+ error:
+ 	bio_io_error(bio);
 -	return 0;
  }
  
- void zram_reset_device(struct zram *zram)
+ void __zram_reset_device(struct zram *zram)
  {
  	size_t index;