Commit 70ec9a1c authored by Ben Hutchings's avatar Ben Hutchings

Merge branch 'henrich/CAN_PEAK_PCIEFD' into 'sid'

enable CONFIG_CAN_PEAK_PCIEFD (Closes: #920809)

See merge request kernel-team/linux!113
parents 1ed73579 fbaa5ba8
......@@ -113,6 +113,8 @@ linux (4.19.17-1) UNRELEASED; urgency=medium
too (Closes: #918589)
* hwmon: Enable CONFIG_SENSORS_NCT7802,NCT7904,NPCM7XX,ASPEED and W83773G
to use HWMON hardware (Closes: #912597)
* net: can: Enable CONFIG_CAN_PEAK_PCIEFD for a PCI express CAN Bus adapter
(Closes: #920809)
[ Vagrant Cascadian ]
* [armhf] Enable CONFIG_MMC_SDHCI_OMAP=m, used on DRA7 and related SoCs.
......
......@@ -2902,6 +2902,11 @@ CONFIG_CAN_CALC_BITTIMING=y
##
# CONFIG_CAN_M_CAN is not set
##
## file: drivers/net/can/peak_canfd/Kconfig
##
CONFIG_CAN_PEAK_PCIEFD=m
##
## file: drivers/net/can/sja1000/Kconfig
##
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment