Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Add config files for Diamond 232L - Rev B processor variant
  xtensa: Fix io regions
  xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
  xtensa: replace remaining __FUNCTION__ occurrences
  xtensa: use newer __SPIN_LOCK_UNLOCKED macro
  XTENSA: warn about including <asm/rwsem.h> directly.

diff --combined arch/xtensa/Kconfig
index a213260b51e5b4d8d3d64d7aebc85d2b2f21eb74,2369ec6b089bab686f5956bbb804b783a37f6490..6c873dceb177c8d79a76bb35ae09a78e7bdb8d6b
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -55,7 -55,6 +55,7 @@@ config H
        default 100
  
  source "init/Kconfig"
 +source "kernel/Kconfig.freezer"
  
  menu "Processor type and features"
  
@@@ -64,7 -63,12 +64,12 @@@ choic
        default XTENSA_VARIANT_FSF
  
  config XTENSA_VARIANT_FSF
-       bool "fsf"
+       bool "fsf - default (not generic) configuration"
+ 
+ config XTENSA_VARIANT_DC232B
+       bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
+       help
+       This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
  endchoice
  
  config MMU

diff --combined drivers/net/Kconfig
index a5a9c6da513406799fb224487314ec2712351e90,d15ab76964eb3eb38b886eda7cd9b782fc0fc186..0b71ebc074b68cc1bd90c50b185e8d6a0eb74956
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -464,6 -464,12 +464,12 @@@ config MIPS_JAZZ_SONI
          This is the driver for the onboard card of MIPS Magnum 4000,
          Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
  
+ config XTENSA_XT2000_SONIC
+       tristate "Xtensa XT2000 onboard SONIC Ethernet support"
+       depends on XTENSA_PLATFORM_XT2000
+       help
+         This is the driver for the onboard card of the Xtensa XT2000 board.
+ 
  config MIPS_AU1X00_ENET
        bool "MIPS AU1000 Ethernet support"
        depends on SOC_AU1X00
@@@ -2410,6 -2416,7 +2416,6 @@@ config IXGB
        tristate "Intel(R) 10GbE PCI Express adapters support"
        depends on PCI && INET
        select INET_LRO
 -      select INTEL_IOATDMA
        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go
@@@ -2425,11 -2432,6 +2431,11 @@@
          To compile this driver as a module, choose M here. The module
          will be called ixgbe.
  
 +config IXGBE_DCA
 +      bool
 +      default y
 +      depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
 +
  config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI
@@@ -2466,6 -2468,7 +2472,6 @@@ config MYRI10G
        select FW_LOADER
        select CRC32
        select INET_LRO
 -      select INTEL_IOATDMA
        ---help---
          This driver supports Myricom Myri-10G Dual Protocol interface in
          Ethernet mode. If the eeprom on your board is not recent enough,
@@@ -2477,11 -2480,6 +2483,11 @@@
          To compile this driver as a module, choose M here. The module
          will be called myri10ge.
  
 +config MYRI10GE_DCA
 +      bool
 +      default y
 +      depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
 +
  config NETXEN_NIC
        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
        depends on PCI
@@@ -2504,15 -2502,6 +2510,15 @@@ config PASEMI_MA
          This driver supports the on-chip 1/10Gbit Ethernet controller on
          PA Semi's PWRficient line of chips.
  
 +config MLX4_EN
 +      tristate "Mellanox Technologies 10Gbit Ethernet support"
 +      depends on PCI && INET
 +      select MLX4_CORE
 +      select INET_LRO
 +      help
 +        This driver supports Mellanox Technologies ConnectX Ethernet
 +        devices.
 +
  config MLX4_CORE
        tristate
        depends on PCI