diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-07 20:04:42 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-07 20:04:42 +0100 |
| commit | d846ff5048f98f0320452ef14b15f8549823df79 (patch) | |
| tree | c78bfe3a0b08a01ea8bdbc3aea5067bf1d42969b /kernel-armv7hl-lpae-debug.config | |
| parent | 78a8990588270e5423160b961fa875b281f0f859 (diff) | |
| parent | 6b0750a9a3cb4ce47aebfd84bc9a9aebd0a6bfe8 (diff) | |
| download | kernel-d846ff5048f98f0320452ef14b15f8549823df79.tar.gz kernel-d846ff5048f98f0320452ef14b15f8549823df79.tar.xz kernel-d846ff5048f98f0320452ef14b15f8549823df79.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc6.git2.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-armv7hl-lpae-debug.config')
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4c2df69d1..b7dfc4800 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3126,7 +3126,7 @@ CONFIG_MAC_PARTITION=y CONFIG_MACSEC=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m -# CONFIG_MAG3110 is not set +CONFIG_MAG3110=m CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 CONFIG_MAGIC_SYSRQ_SERIAL=y CONFIG_MAGIC_SYSRQ=y |