Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7903f9c7839e43aaa0feba4e255aa8a859e27750..81ef81c9a5841904887b70a3d37470a624467fbf 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -5,6 +5,7 @@
 
 menuconfig NETDEVICES
        default y if UML
+       depends on NET
        bool "Network device support"
        ---help---
          You can say N here if you don't intend to connect your Linux box to
@@ -205,7 +206,7 @@ config MII
 config MACB
        tristate "Atmel MACB support"
        depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263
-       select MII
+       select PHYLIB
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91
          parts. Say Y to include support for the MACB chip.
@@ -405,22 +406,6 @@ config ATARILANCE
          on the AMD Lance chipset: RieblCard (with or without battery), or
          PAMCard VME (also the version by Rhotron, with different addresses).
 
-config ATARI_BIONET
-       tristate "BioNet-100 support"
-       depends on ATARI && ATARI_ACSI && BROKEN
-       help
-         Say Y to include support for BioData's BioNet-100 Ethernet adapter
-         for the ACSI port. The driver works (has to work...) with a polled
-         I/O scheme, so it's rather slow :-(
-
-config ATARI_PAMSNET
-       tristate "PAMsNet support"
-       depends on ATARI && ATARI_ACSI && BROKEN
-       help
-         Say Y to include support for the PAMsNet Ethernet adapter for the
-         ACSI port ("ACSI node"). The driver works (has to work...) with a
-         polled I/O scheme, so it's rather slow :-(
-
 config SUN3LANCE
        tristate "Sun3/Sun3x on-board LANCE support"
        depends on SUN3 || SUN3X
@@ -854,6 +839,50 @@ config ULTRA32
          <file:Documentation/networking/net-modules.txt>. The module
          will be called smc-ultra32.
 
+config BFIN_MAC
+       tristate "Blackfin 536/537 on-chip mac support"
+       depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H)
+       select CRC32
+       select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
+       help
+         This is the driver for blackfin on-chip mac device. Say Y if you want it
+         compiled into the kernel. This driver is also available as a module
+         ( = code which can be inserted in and removed from the running kernel
+         whenever you want). The module will be called bfin_mac.
+
+config BFIN_MAC_USE_L1
+       bool "Use L1 memory for rx/tx packets"
+       depends on BFIN_MAC && BF537
+       default y
+       help
+         To get maximum network performace, you should use L1 memory as rx/tx buffers.
+         Say N here if you want to reserve L1 memory for other uses.
+
+config BFIN_TX_DESC_NUM
+       int "Number of transmit buffer packets"
+       depends on BFIN_MAC
+       range 6 10 if BFIN_MAC_USE_L1
+       range 10 100
+       default "10"
+       help
+         Set the number of buffer packets used in driver.
+
+config BFIN_RX_DESC_NUM
+       int "Number of receive buffer packets"
+       depends on BFIN_MAC
+       range 20 100 if BFIN_MAC_USE_L1
+       range 20 800
+       default "20"
+       help
+         Set the number of buffer packets used in driver.
+
+config BFIN_MAC_RMII
+       bool "RMII PHY Interface (EXPERIMENTAL)"
+       depends on BFIN_MAC && EXPERIMENTAL
+       default n
+       help
+         Use Reduced PHY MII Interface
+
 config SMC9194
        tristate "SMC 9194 support"
        depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
@@ -2502,6 +2531,18 @@ source "drivers/atm/Kconfig"
 
 source "drivers/s390/net/Kconfig"
 
+config XEN_NETDEV_FRONTEND
+       tristate "Xen network device frontend driver"
+       depends on XEN
+       default y
+       help
+         The network device frontend driver allows the kernel to
+         access network devices exported exported by a virtual
+         machine containing a physical network device driver. The
+         frontend driver is intended for unprivileged guest domains;
+         if you are compiling a kernel for a Xen guest, you almost
+         certainly want to enable this.
+
 config ISERIES_VETH
        tristate "iSeries Virtual Ethernet driver support"
        depends on PPC_ISERIES
@@ -2810,7 +2851,7 @@ config PPPOATM
 
 config PPPOL2TP
        tristate "PPP over L2TP (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PPP
+       depends on EXPERIMENTAL && PPP && INET
        help
          Support for PPP-over-L2TP socket family. L2TP is a protocol
          used by ISPs and enterprises to tunnel PPP traffic over UDP