diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-02-19 02:03:58 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2022-02-19 02:03:58 +0100 |
| commit | 486c2d15aa812d669bb27f8241aa5d5dafbac5b9 (patch) | |
| tree | f0617d40136960aacdc23726984d490fb9cb2d1b | |
| parent | d1e972ace42390de739cde87d96043dcbe502286 (diff) | |
| parent | 6f66db29e2415cbe8759c48584f9cae19b3c2651 (diff) | |
Merge tag 'intel-pinctrl-v5.17-5' of gitolite.kernel.org:pub/scm/linux/kernel/git/pinctrl/intel into fixespinctrl-v5-17-3
intel-pinctrl for v5.17-5
* Revert misplaced ID
The following is an automated git shortlog grouped by driver:
tigerlake:
- Revert "Add Alder Lake-M ACPI ID"
| -rw-r--r-- | drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-tigerlake.c b/drivers/pinctrl/intel/pinctrl-tigerlake.c index 0bcd19597e4a..3ddaeffc0415 100644 --- a/drivers/pinctrl/intel/pinctrl-tigerlake.c +++ b/drivers/pinctrl/intel/pinctrl-tigerlake.c @@ -749,7 +749,6 @@ static const struct acpi_device_id tgl_pinctrl_acpi_match[] = { { "INT34C5", (kernel_ulong_t)&tgllp_soc_data }, { "INT34C6", (kernel_ulong_t)&tglh_soc_data }, { "INTC1055", (kernel_ulong_t)&tgllp_soc_data }, - { "INTC1057", (kernel_ulong_t)&tgllp_soc_data }, { } }; MODULE_DEVICE_TABLE(acpi, tgl_pinctrl_acpi_match); |