Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c

1 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 38fbd0a0e402..5b6ee46fa7f6 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -272,7 +272,6 @@ config MACH_H5000
 config MACH_HIMALAYA
         bool "HTC Himalaya Support"
         select CPU_PXA26x
-        select FB_W100
 
 config MACH_MAGICIAN
         bool "Enable HTC Magician Support"
@@ -454,6 +453,13 @@ config PXA_SHARPSL
 config SHARPSL_PM
         bool
         select APM_EMULATION
+        select SHARPSL_PM_MAX1111
+
+config SHARPSL_PM_MAX1111
+        bool
+        depends on !CORGI_SSP_DEPRECATED
+        select HWMON
+        select SENSORS_MAX1111
 
 config CORGI_SSP_DEPRECATED
         bool
@@ -547,7 +553,6 @@ config MACH_E740
         bool "Toshiba e740"
         default y
         depends on ARCH_PXA_ESERIES
-        select FB_W100
         help
           Say Y here if you intend to run this kernel on a Toshiba
           e740 family PDA.
@@ -556,7 +561,6 @@ config MACH_E750
         bool "Toshiba e750"
         default y
         depends on ARCH_PXA_ESERIES
-        select FB_W100
         help
           Say Y here if you intend to run this kernel on a Toshiba
           e750 family PDA.
@@ -573,7 +577,6 @@ config MACH_E800
         bool "Toshiba e800"
         default y
         depends on ARCH_PXA_ESERIES
-        select FB_W100
         help
           Say Y here if you intend to run this kernel on a Toshiba
           e800 family PDA.