Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h

1 files changed, 46 insertions, 13 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 28c17d1ca5cb..9de0eed6755b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -32,7 +32,7 @@ config IFB
         tristate "Intermediate Functional Block support"
         depends on NET_CLS_ACT
         ---help---
-          This is an intermidiate driver that allows sharing of
+          This is an intermediate driver that allows sharing of
           resources.
           To compile this driver as a module, choose M here: the module
           will be called ifb.  If you want to use more than one ifb
@@ -188,6 +188,17 @@ config MII
           or internal device.  It is safe to say Y or M here even if your
           ethernet card lack MII.
 
+config MACB
+        tristate "Atmel MACB support"
+        depends on NET_ETHERNET && AVR32
+        select MII
+        help
+          The Atmel MACB ethernet interface is found on many AT32 and AT91
+          parts. Say Y to include support for the MACB chip.
+
+          To compile this driver as a module, choose M here: the module
+          will be called macb.
+
 source "drivers/net/arm/Kconfig"
 
 config MACE
@@ -486,7 +497,7 @@ config SGI_IOC3_ETH_HW_TX_CSUM
 
 config MIPS_SIM_NET
         tristate "MIPS simulator Network device (EXPERIMENTAL)"
-        depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
+        depends on MIPS_SIM && EXPERIMENTAL
         help
           The MIPSNET device is a simple Ethernet network device which is
           emulated by the MIPS Simulator.
@@ -1769,8 +1780,8 @@ config VIA_RHINE_NAPI
           information.
 
 config LAN_SAA9730
-        bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
-        depends on NET_PCI && EXPERIMENTAL && MIPS
+        bool "Philips SAA9730 Ethernet support"
+        depends on NET_PCI && PCI && MIPS_ATLAS
         help
           The SAA9730 is a combined multimedia and peripheral controller used
           in thin clients, Internet access terminals, and diskless
@@ -2136,7 +2147,7 @@ config SK98LIN
           This driver supports the original Yukon chipset. A cleaner driver is 
           also available (skge) which seems to work better than this one.
 
-          This driver does not support the newer Yukon2 chipset. A seperate
+          This driver does not support the newer Yukon2 chipset. A separate
           driver, sky2, is provided to support Yukon2-based adapters.
 
           The following adapters are supported by this driver:
@@ -2251,6 +2262,14 @@ config SPIDER_NET
           This driver supports the Gigabit Ethernet chips present on the
           Cell Processor-Based Blades from IBM.
 
+config TSI108_ETH
+           tristate "Tundra TSI108 gigabit Ethernet support"
+           depends on TSI108_BRIDGE
+           help
+             This driver supports Tundra TSI108 gigabit Ethernet ports.
+             To compile this driver as a module, choose M here: the module
+             will be called tsi108_eth.
+
 config GIANFAR
         tristate "Gianfar Ethernet"
         depends on 85xx || 83xx || PPC_86xx
@@ -2341,10 +2360,11 @@ menu "Ethernet (10000 Mbit)"
 config CHELSIO_T1
         tristate "Chelsio 10Gb Ethernet support"
         depends on PCI
+        select CRC32
         help
-          This driver supports Chelsio N110 and N210 models 10Gb Ethernet
-          cards. More information about adapter features and performance
-          tuning is in <file:Documentation/networking/cxgb.txt>.
+          This driver supports Chelsio gigabit and 10-gigabit
+          Ethernet cards. More information about adapter features and
+          performance tuning is in <file:Documentation/networking/cxgb.txt>.
 
           For general information about Chelsio and our products, visit
           our website at <http://www.chelsio.com>.
@@ -2357,6 +2377,13 @@ config CHELSIO_T1
           To compile this driver as a module, choose M here: the module
           will be called cxgb.
 
+config CHELSIO_T1_1G
+        bool "Chelsio gigabit Ethernet support"
+        depends on CHELSIO_T1
+        help
+          Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
+          are using only 10G cards say 'N' here.
+
 config EHEA
         tristate "eHEA Ethernet support"
         depends on IBMEBUS
@@ -2447,6 +2474,12 @@ config MYRI10GE
           <file:Documentation/networking/net-modules.txt>.  The module
           will be called myri10ge.
 
+config NETXEN_NIC
+        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+        depends on PCI
+        help
+          This enables the support for NetXen's Gigabit Ethernet card.
+
 endmenu
 
 source "drivers/net/tokenring/Kconfig"
@@ -2467,7 +2500,7 @@ config ISERIES_VETH
 
 config RIONET
         tristate "RapidIO Ethernet over messaging driver support"
-        depends on NETDEVICES && RAPIDIO
+        depends on RAPIDIO
 
 config RIONET_TX_SIZE
         int "Number of outbound queue entries"
@@ -2833,7 +2866,7 @@ config NET_FC
           "SCSI generic support".
 
 config SHAPER
-        tristate "Traffic Shaper (EXPERIMENTAL)"
+        tristate "Traffic Shaper (OBSOLETE)"
         depends on EXPERIMENTAL
         ---help---
           The traffic shaper is a virtual network device that allows you to
@@ -2842,9 +2875,9 @@ config SHAPER
           these virtual devices. See
           <file:Documentation/networking/shaper.txt> for more information.
 
-          An alternative to this traffic shaper is the experimental
-          Class-Based Queuing (CBQ) scheduling support which you get if you
-          say Y to "QoS and/or fair queuing" above.
+          An alternative to this traffic shaper are traffic schedulers which
+          you'll get if you say Y to "QoS and/or fair queuing" in
+          "Networking options".
 
           To compile this driver as a module, choose M here: the module
           will be called shaper.  If unsure, say N.