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-s390x-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-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index ad17f09f9..35de780b8 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -617,7 +617,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y |