From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 26 Oct 2022 07:58:29 +0000 (+0200)
Subject: Merge tag 'intel-pinctrl-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.2-rc1~119^2~53
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=76f3768132eab2c26c9d67022b452358adc28b2c;p=users%2Fdwmw2%2Flinux.git

Merge tag 'intel-pinctrl-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel

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
---

76f3768132eab2c26c9d67022b452358adc28b2c
diff --cc drivers/pinctrl/pinctrl-cy8c95x0.c
index ee753e0804814,5eb5521636fe2..564fbaabcdb80
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@@ -20,11 -20,11 +20,12 @@@
  #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 */