diff options
| author | Ben Hutchings <benh@debian.org> | 2020-08-14 01:01:16 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-08-14 01:01:51 +0100 |
| commit | a9eddf9dd18183c222bc5608c63bf2e2bb1a4453 (patch) | |
| tree | fb4fe52cbb05ba7605b7bf2462d28db4122d956f | |
| parent | c1a6f85ef9d7a6ec7c0fa1dbc83e98c1e9efdfdd (diff) | |
| parent | 0ec16d2b3e9b9a812e69e407322a90f5572cf375 (diff) | |
| download | kernel_replicant_linux-a9eddf9dd18183c222bc5608c63bf2e2bb1a4453.tar.gz kernel_replicant_linux-a9eddf9dd18183c222bc5608c63bf2e2bb1a4453.tar.bz2 kernel_replicant_linux-a9eddf9dd18183c222bc5608c63bf2e2bb1a4453.zip | |
Merge branch 'laptop' into master
Add Xiaomi laptop module.
See merge request kernel-team/linux!248
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/kernelarch-x86/config | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 318e9e2f897a..538636e4922f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ linux (5.8-1~exp1) UNRELEASED; urgency=medium * bpftool: add packaging for tools/bpf/bpftool (Closes: #896165) - Thank you to Noah Meyerhans for the first iteration of packaging. + [ Thomas W ] + * [x86] Enable CONFIG_XIAOMI_WMI + -- Yves-Alexis Perez <corsac@debian.org> Wed, 24 Jun 2020 21:58:24 +0200 linux (5.7.10-1) unstable; urgency=medium diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 2e6da257de8c..4119a274b063 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1347,6 +1347,7 @@ CONFIG_ALIENWARE_WMI=m CONFIG_HUAWEI_WMI=m CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_PEAQ_WMI=m +CONFIG_XIAOMI_WMI=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m |