From: David S. Miller <davem@davemloft.net>
Date: Thu, 19 Nov 2009 06:19:03 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~16449^2~279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3505d1a9fd65e2d3e00827857b6795d9d8983658;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
---

3505d1a9fd65e2d3e00827857b6795d9d8983658
diff --cc drivers/net/sfc/falcon_boards.c
index 99f7372,49eb91b..d31c134
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@@ -333,17 -194,17 +333,17 @@@ static int sfn4111t_reset(struct efx_ni
  	 * FLASH_CFG_1 strap (GPIO 3) appropriately.  Only change the
  	 * output enables; the output levels should always be 0 (low)
  	 * and we rely on external pull-ups. */
 -	falcon_read(efx, &reg, GPIO_CTL_REG_KER);
 -	EFX_SET_OWORD_FIELD(reg, GPIO2_OEN, true);
 -	falcon_write(efx, &reg, GPIO_CTL_REG_KER);
 +	efx_reado(efx, &reg, FR_AB_GPIO_CTL);
 +	EFX_SET_OWORD_FIELD(reg, FRF_AB_GPIO2_OEN, true);
 +	efx_writeo(efx, &reg, FR_AB_GPIO_CTL);
  	msleep(1000);
 -	EFX_SET_OWORD_FIELD(reg, GPIO2_OEN, false);
 -	EFX_SET_OWORD_FIELD(reg, GPIO3_OEN,
 +	EFX_SET_OWORD_FIELD(reg, FRF_AB_GPIO2_OEN, false);
 +	EFX_SET_OWORD_FIELD(reg, FRF_AB_GPIO3_OEN,
  			    !!(efx->phy_mode & PHY_MODE_SPECIAL));
 -	falcon_write(efx, &reg, GPIO_CTL_REG_KER);
 +	efx_writeo(efx, &reg, FR_AB_GPIO_CTL);
  	msleep(1);
  
- 	mutex_unlock(&efx->i2c_adap.bus_lock);
+ 	i2c_unlock_adapter(&efx->i2c_adap);
  
  	ssleep(1);
  	return 0;
diff --cc drivers/net/wireless/libertas/tx.c
index 5d7c011,8c3766a6..eb856ad
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@@ -3,8 -3,9 +3,9 @@@
    */
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
+ #include <linux/sched.h>
  
 -#include "hostcmd.h"
 +#include "host.h"
  #include "radiotap.h"
  #include "decl.h"
  #include "defs.h"
diff --cc drivers/staging/Kconfig
index 4e3873b,d21b346..dfcd75c
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -129,15 -125,5 +125,13 @@@ source "drivers/staging/sep/Kconfig
  
  source "drivers/staging/iio/Kconfig"
  
- source "drivers/staging/cowloop/Kconfig"
- 
 +source "drivers/staging/strip/Kconfig"
 +
 +source "drivers/staging/arlan/Kconfig"
 +
 +source "drivers/staging/wavelan/Kconfig"
 +
 +source "drivers/staging/netwave/Kconfig"
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING
diff --cc drivers/staging/Makefile
index fb1d785,8cbf1ae..7719d04
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -46,9 -44,3 +44,8 @@@ obj-$(CONFIG_VME_BUS)		+= vme
  obj-$(CONFIG_RAR_REGISTER)	+= rar/
  obj-$(CONFIG_DX_SEP)		+= sep/
  obj-$(CONFIG_IIO)		+= iio/
- obj-$(CONFIG_COWLOOP)		+= cowloop/
 +obj-$(CONFIG_STRIP)		+= strip/
 +obj-$(CONFIG_ARLAN)		+= arlan/
 +obj-$(CONFIG_WAVELAN)		+= wavelan/
 +obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/
 +obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/
diff --cc drivers/staging/rtl8187se/Kconfig
index faf6c60,203c79b..3211dd3
--- a/drivers/staging/rtl8187se/Kconfig
+++ b/drivers/staging/rtl8187se/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
  config RTL8187SE
  	tristate "RealTek RTL8187SE Wireless LAN NIC driver"
- 	depends on PCI
+ 	depends on PCI && WLAN
 -	depends on WIRELESS_EXT
 +	select WIRELESS_EXT
 +	select WEXT_PRIV
  	default N
  	---help---
diff --cc drivers/staging/rtl8192e/Kconfig
index 5c077b9,37e4fde..2ae3745
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
  config RTL8192E
  	tristate "RealTek RTL8192E Wireless LAN NIC driver"
- 	depends on PCI
+ 	depends on PCI && WLAN
 -	depends on WIRELESS_EXT
 +	select WIRELESS_EXT
 +	select WEXT_PRIV
  	default N
  	---help---