diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-10 13:51:24 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-10 13:51:24 +0100 |
| commit | bc19a87078882180ab0fe1bc3a214315253e4fe3 (patch) | |
| tree | b3131e97ec1b895ef92930cfc50826488e09f769 | |
| parent | b91026754a11117ff8ceef8ba36a773863fc8941 (diff) | |
| parent | 40d733babbfb649a876d22f60c5c8c2196c9501e (diff) | |
| download | kernel-bc19a87078882180ab0fe1bc3a214315253e4fe3.tar.gz kernel-bc19a87078882180ab0fe1bc3a214315253e4fe3.tar.xz kernel-bc19a87078882180ab0fe1bc3a214315253e4fe3.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
| -rw-r--r-- | configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI | 1 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI b/configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI new file mode 100644 index 000000000..b13ce3c0b --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI @@ -0,0 +1 @@ +CONFIG_KEYBOARD_APPLESPI=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index ef6898b86..1e7e74847 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2704,7 +2704,7 @@ CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_APPLESPI is not set +CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set CONFIG_KEYBOARD_CROS_EC=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index e721fb10c..bc866f8ad 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2685,7 +2685,7 @@ CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_APPLESPI is not set +CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set CONFIG_KEYBOARD_CROS_EC=m diff --git a/kernel.spec b/kernel.spec index 8b9112f72..5eb64db22 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1852,6 +1852,9 @@ fi # # %changelog +* Thu Nov 07 2019 Jeremy Cline <jcline@redhat.com> +- Add support for a number of Macbook keyboards and touchpads (rhbz 1769465) + * Wed Nov 06 2019 Laura Abbott <labbott@redhat.com> - 5.3.9-200 - Linux v5.3.9 |