Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 27732fdeeea4a81b629851862a9b3393c8acccea..1958d9e16a3aaaa606541ee56173b5811a286c5c 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1163,38 +1163,74 @@ config IBMVETH
          be called ibmveth.
 
 config IBM_EMAC
-       bool "IBM PPC4xx EMAC driver support"
+       tristate "PowerPC 4xx on-chip Ethernet support"
        depends on 4xx
-       select CRC32
-       ---help---
-         This driver supports the IBM PPC4xx EMAC family of on-chip
-         Ethernet controllers.
-
-config IBM_EMAC_ERRMSG
-       bool "Verbose error messages"
-       depends on IBM_EMAC && BROKEN
+       help
+         This driver supports the PowerPC 4xx EMAC family of on-chip
+          Ethernet controllers.
 
 config IBM_EMAC_RXB
        int "Number of receive buffers"
        depends on IBM_EMAC
-       default "128" if IBM_EMAC4
-       default "64"
+       default "128"
 
 config IBM_EMAC_TXB
        int "Number of transmit buffers"
        depends on IBM_EMAC
-       default "128" if IBM_EMAC4
-       default "8"
+       default "64"
 
-config IBM_EMAC_FGAP
-       int "Frame gap"
+config IBM_EMAC_POLL_WEIGHT
+       int "MAL NAPI polling weight"
        depends on IBM_EMAC
-       default "8"
+       default "32"
 
-config IBM_EMAC_SKBRES
-       int "Skb reserve amount"
+config IBM_EMAC_RX_COPY_THRESHOLD
+       int "RX skb copy threshold (bytes)"
+       depends on IBM_EMAC
+       default "256"
+
+config IBM_EMAC_RX_SKB_HEADROOM
+       int "Additional RX skb headroom (bytes)"
        depends on IBM_EMAC
        default "0"
+       help
+         Additional receive skb headroom. Note, that driver
+         will always reserve at least 2 bytes to make IP header
+         aligned, so usualy there is no need to add any additional
+         headroom.
+         
+         If unsure, set to 0.
+
+config IBM_EMAC_PHY_RX_CLK_FIX
+       bool "PHY Rx clock workaround"
+       depends on IBM_EMAC && (405EP || 440GX || 440EP || 440GR)
+       help
+         Enable this if EMAC attached to a PHY which doesn't generate
+         RX clock if there is no link, if this is the case, you will 
+         see "TX disable timeout" or "RX disable timeout" in the system
+         log.
+         
+         If unsure, say N.
+
+config IBM_EMAC_DEBUG
+       bool "Debugging"
+       depends on IBM_EMAC
+       default n
+
+config IBM_EMAC_ZMII
+       bool
+       depends on IBM_EMAC && (NP405H || NP405L || 44x)
+       default y
+
+config IBM_EMAC_RGMII
+       bool
+       depends on IBM_EMAC && 440GX
+       default y
+               
+config IBM_EMAC_TAH
+       bool
+       depends on IBM_EMAC && 440GX
+       default y
 
 config NET_PCI
        bool "EISA, VLB, PCI and on board controllers"
@@ -1338,7 +1374,7 @@ config FORCEDETH
 
 config CS89x0
        tristate "CS89x0 support"
-       depends on (NET_PCI && ISA) || ARCH_PNX0105 || ARCH_IXDP2X01
+       depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105
        ---help---
          Support for CS89x0 chipset based Ethernet cards. If you have a
          network (Ethernet) card of this type, say Y and read the
@@ -2222,17 +2258,6 @@ config S2IO_NAPI
 
          If in doubt, say N.
 
-config 2BUFF_MODE
-       bool "Use 2 Buffer Mode on Rx side."
-       depends on S2IO
-       ---help---
-       On enabling the 2 buffer mode, the received frame will be
-       split into 2 parts before being DMA'ed to the hosts memory.
-       The parts are the ethernet header and ethernet payload. 
-       This is useful on systems where DMA'ing to to unaligned 
-       physical memory loactions comes with a heavy price.
-       If not sure please say N.
-
 endmenu
 
 if !UML