Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / stmicro / stmmac / Kconfig

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index c0ea838c78d1786eeec6b3b85c5aa8d9cf47051a..f695a50bac47d99cdc141a3cf059dff340e54dc3 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -5,6 +5,7 @@ config STMMAC_ETH
        select MII
        select PHYLIB
        select CRC32
+       select PTP_1588_CLOCK
        ---help---
          This is the driver for the Ethernet IPs are built around a
          Synopsys IP Core and only tested on the STMicroelectronics
@@ -54,22 +55,4 @@ config STMMAC_DA
          By default, the DMA arbitration scheme is based on Round-robin
          (rx:tx priority is 1:1).
 
-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