diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 18:05:03 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 18:05:03 +0300 |
| commit | 0f69403d2535ffc7200a8414cf3ca66a49b0d741 (patch) | |
| tree | 3ce85dd08359ea872aa8fb9bd12072efdb80a787 /drivers/net/can/softing/Kconfig | |
| parent | 580fbdc5136822208f107500682e50a1cb232e94 (diff) | |
| parent | 0a19b068acc47d05212f03e494381926dc0381e2 (diff) | |
| download | lwn-0f69403d2535ffc7200a8414cf3ca66a49b0d741.tar.gz lwn-0f69403d2535ffc7200a8414cf3ca66a49b0d741.zip | |
Merge drm/drm-next into drm-intel-next-queued
Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/net/can/softing/Kconfig')
| -rw-r--r-- | drivers/net/can/softing/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig index 0f1708f99308..16b9eec63490 100644 --- a/drivers/net/can/softing/Kconfig +++ b/drivers/net/can/softing/Kconfig @@ -2,7 +2,7 @@ config CAN_SOFTING tristate "Softing Gmbh CAN generic support" depends on HAS_IOMEM - ---help--- + help Support for CAN cards from Softing Gmbh & some cards from Vector Gmbh. Softing Gmbh CAN cards come with 1 or 2 physical busses. @@ -20,7 +20,7 @@ config CAN_SOFTING_CS tristate "Softing Gmbh CAN pcmcia cards" depends on PCMCIA depends on CAN_SOFTING - ---help--- + help Support for PCMCIA cards from Softing Gmbh & some cards from Vector Gmbh. You need firmware for these, which you can get at |