Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6c884ef1b0690ea89fe5ed315c51f761897442ba..4d68a264df9b439d9adf5057db745ec2b1e4f8a7 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2017,6 +2017,13 @@ config FTMAC100
          from Faraday. It is used on Faraday A320, Andes AG101 and some
          other ARM/NDS32 SoC's.
 
          from Faraday. It is used on Faraday A320, Andes AG101 and some
          other ARM/NDS32 SoC's.
 

+config LANTIQ_ETOP
+       tristate "Lantiq SoC ETOP driver"
+       depends on SOC_TYPE_XWAY
+       help
+         Support for the MII0 inside the Lantiq SoC
+
+

 source "drivers/net/fs_enet/Kconfig"
 
 source "drivers/net/octeon/Kconfig"
 source "drivers/net/fs_enet/Kconfig"
 
 source "drivers/net/octeon/Kconfig"


@@ -2108,7 +2115,6 @@ config E1000
 
 config E1000E
        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
 
 config E1000E
        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"

-       select CRC32

        depends on PCI && (!SPARC32 || BROKEN)
        select CRC32
        ---help---
        depends on PCI && (!SPARC32 || BROKEN)
        select CRC32
        ---help---


@@ -2190,15 +2196,6 @@ config IGBVF
 
 source "drivers/net/ixp2000/Kconfig"
 
 
 source "drivers/net/ixp2000/Kconfig"
 

-config MYRI_SBUS
-       tristate "MyriCOM Gigabit Ethernet support"
-       depends on SBUS
-       help
-         This driver supports MyriCOM Sbus gigabit Ethernet cards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called myri_sbus.  This is recommended.
-

 config NS83820
        tristate "National Semiconductor DP83820 support"
        depends on PCI
 config NS83820
        tristate "National Semiconductor DP83820 support"
        depends on PCI


@@ -2554,6 +2551,15 @@ config PCH_GBE
          ML7223 is companion chip for Intel Atom E6xx series.
          ML7223 is completely compatible for Intel EG20T PCH.
 
          ML7223 is companion chip for Intel Atom E6xx series.
          ML7223 is completely compatible for Intel EG20T PCH.
 

+config FTGMAC100
+       tristate "Faraday FTGMAC100 Gigabit Ethernet support"
+       depends on ARM
+       select PHYLIB
+       help
+         This driver supports the FTGMAC100 Gigabit Ethernet controller
+         from Faraday. It is used on Faraday A369, Andes AG102 and some
+         other ARM/NDS32 SoC's.
+

 endif # NETDEV_1000
 
 #
 endif # NETDEV_1000
 
 #


@@ -3409,7 +3415,8 @@ config NETCONSOLE
 
 config NETCONSOLE_DYNAMIC
        bool "Dynamic reconfiguration of logging targets"
 
 config NETCONSOLE_DYNAMIC
        bool "Dynamic reconfiguration of logging targets"

-       depends on NETCONSOLE && SYSFS && CONFIGFS_FS
+       depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
+                       !(NETCONSOLE=y && CONFIGFS_FS=m)

        help
          This option enables the ability to dynamically reconfigure target
          parameters (interface, IP addresses, port numbers, MAC addresses)
        help
          This option enables the ability to dynamically reconfigure target
          parameters (interface, IP addresses, port numbers, MAC addresses)