[PATCH] bcm43xx: correct "Move IV/ICV stripping into ieee80211_rx"

[safe/jmp/linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 112d4cd..10ac1c7 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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
@@ -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