diff options
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r-- | drivers/net/ethernet/marvell/Kconfig | 24 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/octeontx2/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index 3d5caea096fb..cd8ddd1ef6f2 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -7,7 +7,7 @@ config NET_VENDOR_MARVELL bool "Marvell devices" default y depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET || COMPILE_TEST - ---help--- + help If you have a network (Ethernet) card belonging to this class, say Y. Note that the answer to this question doesn't directly affect the @@ -23,7 +23,7 @@ config MV643XX_ETH depends on INET select PHYLIB select MVMDIO - ---help--- + help This driver supports the gigabit ethernet MACs in the Marvell Discovery PPC/MIPS chipset family (MV643XX) and in the Marvell Orion ARM SoC family. @@ -35,7 +35,7 @@ config MVMDIO tristate "Marvell MDIO interface support" depends on HAS_IOMEM select PHYLIB - ---help--- + help This driver supports the MDIO interface found in the network interface units of the Marvell EBU SoCs (Kirkwood, Orion5x, Dove, Armada 370 and Armada XP). @@ -46,7 +46,7 @@ config MVNETA_BM_ENABLE tristate "Marvell Armada 38x/XP network interface BM support" depends on MVNETA depends on !64BIT - ---help--- + help This driver supports auxiliary block of the network interface units in the Marvell ARMADA XP and ARMADA 38x SoC family, which is called buffer manager. @@ -62,7 +62,7 @@ config MVNETA select MVMDIO select PHYLINK select PAGE_POOL - ---help--- + help This driver supports the network interface units in the Marvell ARMADA XP, ARMADA 370, ARMADA 38x and ARMADA 37xx SoC family. @@ -87,7 +87,7 @@ config MVPP2 depends on ARCH_MVEBU || COMPILE_TEST select MVMDIO select PHYLINK - ---help--- + help This driver supports the network interface units in the Marvell ARMADA 375, 7K and 8K SoCs. @@ -96,7 +96,7 @@ config PXA168_ETH depends on HAS_IOMEM depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST select PHYLIB - ---help--- + help This driver supports the pxa168 Ethernet ports. To compile this driver as a module, choose M here. The module @@ -106,7 +106,7 @@ config SKGE tristate "Marvell Yukon Gigabit Ethernet support" depends on PCI select CRC32 - ---help--- + help This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx and related Gigabit Ethernet adapters. It is a new smaller driver with better performance and more complete ethtool support. @@ -127,7 +127,7 @@ config SKGE config SKGE_DEBUG bool "Debugging interface" depends on SKGE && DEBUG_FS - ---help--- + help This option adds the ability to dump driver state for debugging. The file /sys/kernel/debug/skge/ethX displays the state of the internal transmit and receive rings. @@ -137,7 +137,7 @@ config SKGE_DEBUG config SKGE_GENESIS bool "Support for older SysKonnect Genesis boards" depends on SKGE - ---help--- + help This enables support for the older and uncommon SysKonnect Genesis chips, which support MII via an external transceiver, instead of an internal one. Disabling this option will save some memory @@ -147,7 +147,7 @@ config SKY2 tristate "Marvell Yukon 2 support" depends on PCI select CRC32 - ---help--- + help This driver supports Gigabit Ethernet adapters based on the Marvell Yukon 2 chipset: Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ @@ -162,7 +162,7 @@ config SKY2 config SKY2_DEBUG bool "Debugging interface" depends on SKY2 && DEBUG_FS - ---help--- + help This option adds the ability to dump driver state for debugging. The file /sys/kernel/debug/sky2/ethX displays the state of the internal transmit and receive rings. diff --git a/drivers/net/ethernet/marvell/octeontx2/Kconfig b/drivers/net/ethernet/marvell/octeontx2/Kconfig index d9dfb614daa6..543a1d047567 100644 --- a/drivers/net/ethernet/marvell/octeontx2/Kconfig +++ b/drivers/net/ethernet/marvell/octeontx2/Kconfig @@ -21,7 +21,7 @@ config NDC_DIS_DYNAMIC_CACHING bool "Disable caching of dynamic entries in NDC" depends on OCTEONTX2_AF default n - ---help--- + help This config option disables caching of dynamic entries such as NIX SQEs , NPA stack pages etc in NDC. Also locks down NIX SQ/CQ/RQ/RSS and NPA Aura/Pool contexts. diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 17243bb5ba91..eb8cf60ecf12 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -31,8 +31,8 @@ #include <linux/types.h> #include <linux/udp.h> #include <linux/workqueue.h> +#include <linux/pgtable.h> -#include <asm/pgtable.h> #include <asm/cacheflush.h> #define DRIVER_NAME "pxa168-eth" |