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/faraday | |
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/faraday')
-rw-r--r-- | drivers/net/ethernet/faraday/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig index 73e4f2648e49..c2677ec0564d 100644 --- a/drivers/net/ethernet/faraday/Kconfig +++ b/drivers/net/ethernet/faraday/Kconfig @@ -7,7 +7,7 @@ config NET_VENDOR_FARADAY bool "Faraday devices" default y depends on ARM || NDS32 || 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 @@ -22,7 +22,7 @@ config FTMAC100 depends on ARM || NDS32 || COMPILE_TEST depends on !64BIT || BROKEN select MII - ---help--- + help This driver supports the FTMAC100 10/100 Ethernet controller from Faraday. It is used on Faraday A320, Andes AG101 and some other ARM/NDS32 SoC's. @@ -33,7 +33,7 @@ config FTGMAC100 depends on !64BIT || BROKEN select PHYLIB select MDIO_ASPEED if MACH_ASPEED_G6 - ---help--- + 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. |