diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 22:29:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 22:29:16 +0200 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/net/ethernet/xilinx/Kconfig | |
parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
parent | treewide: replace '---help---' in Kconfig files with 'help' (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.zip |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'drivers/net/ethernet/xilinx/Kconfig')
-rw-r--r-- | drivers/net/ethernet/xilinx/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig index 0810af8193cb..d0d0d4fe9d40 100644 --- a/drivers/net/ethernet/xilinx/Kconfig +++ b/drivers/net/ethernet/xilinx/Kconfig @@ -6,7 +6,7 @@ config NET_VENDOR_XILINX bool "Xilinx devices" default y - ---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 @@ -20,20 +20,20 @@ config XILINX_EMACLITE tristate "Xilinx 10/100 Ethernet Lite support" depends on PPC32 || MICROBLAZE || ARCH_ZYNQ || MIPS select PHYLIB - ---help--- + help This driver supports the 10/100 Ethernet Lite from Xilinx. config XILINX_AXI_EMAC tristate "Xilinx 10/100/1000 AXI Ethernet support" select PHYLINK - ---help--- + help This driver supports the 10/100/1000 Ethernet from Xilinx for the AXI bus interface used in Xilinx Virtex FPGAs and Soc's. config XILINX_LL_TEMAC tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" select PHYLIB - ---help--- + help This driver supports the Xilinx 10/100/1000 LocalLink TEMAC core used in Xilinx Spartan and Virtex FPGAs |