net: add dependency on fw class module to qlcnic and netxen_nic

[net-next-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7b832c727f873b6964b1faa1c121a73796b113e4..ce2fcdd4ab90521af8a8fb9a3f873b796b0a2bd9 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -483,7 +483,7 @@ config XTENSA_XT2000_SONIC
          This is the driver for the onboard card of the Xtensa XT2000 board.
 
 config MIPS_AU1X00_ENET
-       bool "MIPS AU1000 Ethernet support"
+       tristate "MIPS AU1000 Ethernet support"
        depends on SOC_AU1X00
        select PHYLIB
        select CRC32
@@ -887,6 +887,13 @@ config BFIN_MAC_RMII
        help
          Use Reduced PHY MII Interface
 
+config BFIN_MAC_USE_HWSTAMP
+       bool "Use IEEE 1588 hwstamp"
+       depends on BFIN_MAC && BF518
+       default y
+       help
+         To support the IEEE 1588 Precision Time Protocol (PTP), select y here
+
 config SMC9194
        tristate "SMC 9194 support"
        depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
@@ -1453,20 +1460,6 @@ config FORCEDETH
          To compile this driver as a module, choose M here. The module
          will be called forcedeth.
 
-config FORCEDETH_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on FORCEDETH && EXPERIMENTAL
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-
 config CS89x0
        tristate "CS89x0 support"
        depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
@@ -1916,6 +1909,7 @@ 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 || ARCH_MX5
+       select PHYLIB
        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.
@@ -2434,8 +2428,8 @@ config MV643XX_ETH
 
 config XILINX_LL_TEMAC
        tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+       depends on PPC || MICROBLAZE
        select PHYLIB
-       depends on PPC_DCR_NATIVE
        help
          This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
          core used in Xilinx Spartan and Virtex FPGAs
@@ -2618,11 +2612,11 @@ config EHEA
          will be called ehea.
 
 config ENIC
-       tristate "Cisco 10G Ethernet NIC support"
+       tristate "Cisco VIC Ethernet NIC Support"
        depends on PCI && INET
        select INET_LRO
        help
-         This enables the support for the Cisco 10G Ethernet card.
+         This enables the support for the Cisco VIC Ethernet card.
 
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"
@@ -2760,6 +2754,7 @@ config MYRI10GE_DCA
 config NETXEN_NIC
        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
        depends on PCI
+       select FW_LOADER
        help
          This enables the support for NetXen's Gigabit Ethernet card.
 
@@ -2825,6 +2820,7 @@ config BNX2X
 config QLCNIC
        tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
        depends on PCI
+       select FW_LOADER
        help
          This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
          devices.
@@ -2862,6 +2858,8 @@ source "drivers/ieee802154/Kconfig"
 
 source "drivers/s390/net/Kconfig"
 
+source "drivers/net/caif/Kconfig"
+
 config XEN_NETDEV_FRONTEND
        tristate "Xen network device frontend driver"
        depends on XEN
@@ -3180,17 +3178,12 @@ config PPPOATM
 
 config PPPOL2TP
        tristate "PPP over L2TP (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PPP && INET
+       depends on EXPERIMENTAL && L2TP && PPP
        help
          Support for PPP-over-L2TP socket family. L2TP is a protocol
          used by ISPs and enterprises to tunnel PPP traffic over UDP
          tunnels. L2TP is replacing PPTP for VPN uses.
 
-         This kernel component handles only L2TP data packets: a
-         userland daemon handles L2TP the control protocol (tunnel
-         and session setup). One such daemon is OpenL2TP
-         (http://openl2tp.sourceforge.net/).
-
 config SLIP
        tristate "SLIP (serial line) support"
        ---help---
@@ -3277,15 +3270,14 @@ config NET_FC
          "SCSI generic support".
 
 config NETCONSOLE
-       tristate "Network console logging support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "Network console logging support"
        ---help---
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 
 config NETCONSOLE_DYNAMIC
-       bool "Dynamic reconfiguration of logging targets (EXPERIMENTAL)"
-       depends on NETCONSOLE && SYSFS && EXPERIMENTAL
+       bool "Dynamic reconfiguration of logging targets"
+       depends on NETCONSOLE && SYSFS
        select CONFIGFS_FS
        help
          This option enables the ability to dynamically reconfigure target