diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
| commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
| tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/net/can/mscan/Kconfig | |
| parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
| parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
| download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz | |
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/can/mscan/Kconfig')
| -rw-r--r-- | drivers/net/can/mscan/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig index 3a57a51be22e..dfe6bd9947bb 100644 --- a/drivers/net/can/mscan/Kconfig +++ b/drivers/net/can/mscan/Kconfig @@ -2,7 +2,7 @@ config CAN_MSCAN depends on PPC tristate "Support for Freescale MSCAN based chips" - ---help--- + help The Motorola Scalable Controller Area Network (MSCAN) definition is based on the MSCAN12 definition which is the specific implementation of the Motorola Scalable CAN concept targeted for @@ -13,7 +13,7 @@ if CAN_MSCAN config CAN_MPC5XXX tristate "Freescale MPC5xxx onboard CAN controller" depends on (PPC_MPC52xx || PPC_MPC512x) - ---help--- + help If you say yes here you get support for Freescale's MPC5xxx onboard CAN controller. Currently, the MPC5200, MPC5200B and MPC5121 (Rev. 2 and later) are supported. |