Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[mv-sheeva.git] / drivers / net / ethernet / stmicro / stmmac / Kconfig

diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
similarity index 57%
rename from drivers/net/stmmac/Kconfig
rename to drivers/net/ethernet/stmicro/stmmac/Kconfig
index 9e37a9a8d37706215682b9dc7ddbc4db7d5bbfe7..22745d7bf530d3e4865c869a671f981d4758019d 100644 (file)
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -1,20 +1,29 @@
 config STMMAC_ETH
        tristate "STMicroelectronics 10/100/1000 Ethernet driver"
+       depends on HAS_IOMEM
+       select NET_CORE
        select MII
        select PHYLIB
        select CRC32
-       depends on NETDEVICES && HAS_IOMEM
-       help
+       ---help---
          This is the driver for the Ethernet IPs are built around a
          Synopsys IP Core and only tested on the STMicroelectronics
          platforms.
 
 if STMMAC_ETH
 
+config STMMAC_DEBUG_FS
+       bool "Enable monitoring via sysFS "
+       default n
+       depends on STMMAC_ETH && DEBUG_FS
+       -- help
+         The stmmac entry in /sys reports DMA TX/RX rings
+         or (if supported) the HW cap register.
+
 config STMMAC_DA
        bool "STMMAC DMA arbitration scheme"
        default n
-       help
+       ---help---
          Selecting this option, rx has priority over Tx (only for Giga
          Ethernet device).
          By default, the DMA arbitration scheme is based on Round-robin
@@ -24,7 +33,7 @@ config STMMAC_TIMER
        bool "STMMAC Timer optimisation"
        default n
        depends on RTC_HCTOSYS_DEVICE
-       help
+       ---help---
          Use an external timer for mitigating the number of network
          interrupts. Currently, for SH architectures, it is possible
          to use the TMU channel 2 and the SH-RTC device.
@@ -36,13 +45,31 @@ choice
 config STMMAC_TMU_TIMER
         bool "TMU channel 2"
         depends on CPU_SH4
-       help
+       ---help---
 
 config STMMAC_RTC_TIMER
         bool "Real time clock"
         depends on RTC_CLASS
-       help
+       ---help---
 
 endchoice
 
+choice
+       prompt "Select the DMA TX/RX descriptor operating modes"
+       depends on STMMAC_ETH
+       ---help---
+         This driver supports DMA descriptor to operate both in dual buffer
+         (RING) and linked-list(CHAINED) mode. In RING mode each descriptor
+         points to two data buffer pointers whereas in CHAINED mode they
+         points to only one data buffer pointer.
+
+config STMMAC_RING
+       bool "Enable Descriptor Ring Mode"
+
+config STMMAC_CHAINED
+       bool "Enable Descriptor Chained Mode"
+
+endchoice
+
+
 endif