diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-10-26 09:58:29 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2022-10-26 09:58:29 +0200 |
| commit | 76f3768132eab2c26c9d67022b452358adc28b2c (patch) | |
| tree | 364eccdb613fae6dae1f9160ac8102733d73c30c /drivers/pinctrl/pinctrl-ocelot.c | |
| parent | pinctrl: qcom: sdm670: change sdm670_reserved_gpios to static (diff) | |
| parent | pinctrl: Clean up headers (diff) | |
| download | linux-76f3768132eab2c26c9d67022b452358adc28b2c.tar.xz linux-76f3768132eab2c26c9d67022b452358adc28b2c.zip | |
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
Diffstat (limited to 'drivers/pinctrl/pinctrl-ocelot.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-ocelot.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index 266fbc957273..d1dea0de0129 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -14,15 +14,17 @@ #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_platform.h> -#include <linux/pinctrl/pinctrl.h> -#include <linux/pinctrl/pinmux.h> -#include <linux/pinctrl/pinconf.h> -#include <linux/pinctrl/pinconf-generic.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset.h> #include <linux/slab.h> +#include <linux/pinctrl/consumer.h> +#include <linux/pinctrl/pinconf-generic.h> +#include <linux/pinctrl/pinconf.h> +#include <linux/pinctrl/pinctrl.h> +#include <linux/pinctrl/pinmux.h> + #include "core.h" #include "pinconf.h" #include "pinmux.h" |