ath5k: Use high bitrates for ACK/CTS

[~andy/linux] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ef662e15c3d3b84aafa7b927fc0cf49a78dd1b05..7029cd50c458897e1686925bb2aef9da70d82c92 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -880,8 +880,8 @@ config BFIN_RX_DESC_NUM
          Set the number of buffer packets used in driver.
 
 config BFIN_MAC_RMII
-       bool "RMII PHY Interface (EXPERIMENTAL)"
-       depends on BFIN_MAC && EXPERIMENTAL
+       bool "RMII PHY Interface"
+       depends on BFIN_MAC
        default y if BFIN527_EZKIT
        default n if BFIN537_STAMP
        help
@@ -932,7 +932,7 @@ config NET_NETX
 
 config TI_DAVINCI_EMAC
        tristate "TI DaVinci EMAC Support"
-       depends on ARM && ARCH_DAVINCI
+       depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
        select PHYLIB
        help
          This driver supports TI's DaVinci Ethernet .
@@ -995,6 +995,14 @@ config ETHOC
        help
          Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
 
+config GRETH
+       tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
+       depends on SPARC
+       select PHYLIB
+       select CRC32
+       help
+         Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
+
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
@@ -1380,6 +1388,17 @@ config AC3200
          To compile this driver as a module, choose M here. The module
          will be called ac3200.
 
+config KSZ884X_PCI
+       tristate "Micrel KSZ8841/2 PCI"
+       depends on NET_PCI && PCI
+       select MII
+       select CRC32
+       help
+         This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
+
+         To compile this driver as a module, choose M here. The module
+         will be called ksz884x.
+
 config APRICOT
        tristate "Apricot Xen-II on board Ethernet"
        depends on NET_PCI && ISA
@@ -1895,7 +1914,8 @@ config 68360_ENET
 
 config FEC
        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
-       depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35 || ARCH_MX25
+       depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
+               MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire and Freescale i.MX processors.
@@ -1951,6 +1971,7 @@ config ATL2
 config XILINX_EMACLITE
        tristate "Xilinx 10/100 Ethernet Lite support"
        depends on PPC32 || MICROBLAZE
+       select PHYLIB
        help
          This driver supports the 10/100 Ethernet Lite from Xilinx.