summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/Makefile
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2022-02-28 23:55:50 +0100
committerLinus Walleij <linus.walleij@linaro.org>2022-02-28 23:55:50 +0100
commitf54d626698a4e469e46ce8974f75658426585009 (patch)
tree99ccf624be6c6fdb45ecd56de7d653bd85108f52 /drivers/pinctrl/Makefile
parent1f02c8efa17fac30802fb50ab76d9128fc496384 (diff)
parentd25478e1d8f9bf9344cf61a9c02fae88d9930f55 (diff)
Merge tag 'intel-pinctrl-v5.18-1' of gitolite.kernel.org:pub/scm/linux/kernel/git/pinctrl/intel into devel
intel-pinctrl for v5.18-1 * Introduce support for Alder Lake-N (required to revert misplaced ID) * Add support for Raptor Lake-S * Add support for Ice Lake-N (MacBookPro16,2) * Miscellaneous fixes The following is an automated git shortlog grouped by driver: alderlake: - Add Intel Alder Lake-N pin controller support - Add Raptor Lake-S ACPI ID baytrail: - Clear direct_irq_en flag on broken configs icelake: - Add Ice Lake-N PCH pin controller support intel: - Fix a glitch when updating IRQ flags on a preconfigured line - fix unexpected interrupt Place correctly CONFIG_PINCTRL_ST in the Makefile: - Place correctly CONFIG_PINCTRL_ST in the Makefile tigerlake: - Revert "Add Alder Lake-M ACPI ID"
Diffstat (limited to 'drivers/pinctrl/Makefile')
-rw-r--r--drivers/pinctrl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index b09c5345f82c..c7064d941f4c 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -42,9 +42,9 @@ obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o
obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o
obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
+obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o
obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o
-obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o
obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o
obj-$(CONFIG_PINCTRL_THUNDERBAY) += pinctrl-thunderbay.o