diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-04 22:19:42 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-04 22:19:42 +0100 |
commit | 22c83c8278f77c43647b9bb04428acb3ede31306 (patch) | |
tree | bc2f61b3cbaaaa18431b572864730dafa83ef573 /kernel-armv7hl-debug-fedora.config | |
parent | d14f9fce0773f5a5f8abbffe34199597363f042f (diff) | |
parent | 438e701b23e98287d917ac9a8d824630e40ebc70 (diff) | |
download | kernel-22c83c8278f77c43647b9bb04428acb3ede31306.tar.gz kernel-22c83c8278f77c43647b9bb04428acb3ede31306.tar.xz kernel-22c83c8278f77c43647b9bb04428acb3ede31306.zip |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-armv7hl-debug-fedora.config')
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 505e98d6c..e1e621c5f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -843,7 +843,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m # CONFIG_CAN_TI_HECC is not set -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m |