]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'intel-pinctrl-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 26 Oct 2022 07:58:29 +0000 (09:58 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 26 Oct 2022 07:58:29 +0000 (09:58 +0200)
intel-pinctrl for v6.1-2

* Add missing and remove unused headers in the pin control and GPIO drivers
* Revise the pin control and GPIO headers

1  2 
drivers/pinctrl/actions/pinctrl-owl.c
drivers/pinctrl/pinctrl-at91-pio4.c
drivers/pinctrl/pinctrl-cy8c95x0.c
drivers/pinctrl/pinctrl-ocelot.c
drivers/pinctrl/pinctrl-st.c
drivers/pinctrl/qcom/pinctrl-msm.c

Simple merge
Simple merge
index ee753e080481467e3e3524290da2b9278b265587,5eb5521636fe2a5461c8aac48371a528d8b2badd..564fbaabcdb806f77774e72f60ade9de4b7a83df
  #include <linux/property.h>
  #include <linux/regmap.h>
  #include <linux/regulator/consumer.h>
+ #include <linux/seq_file.h>
  
 -#include <linux/pinctrl/pinctrl.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/pinctrl/pinconf.h>
  #include <linux/pinctrl/pinconf-generic.h>
 +#include <linux/pinctrl/pinctrl.h>
  #include <linux/pinctrl/pinmux.h>
  
  /* Fast access registers */
Simple merge
Simple merge
Simple merge