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/intel/pinctrl-merrifield.c | |
| parent | dbbd909eeb26037fc38a4d29d6d94f7c39631a5e (diff) | |
| parent | e5530adc17a79f2a93e8b35e0ce673fc33f5f663 (diff) | |
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/intel/pinctrl-merrifield.c')
| -rw-r--r-- | drivers/pinctrl/intel/pinctrl-merrifield.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c index 5e752818adb4..527957ea35b7 100644 --- a/drivers/pinctrl/intel/pinctrl-merrifield.c +++ b/drivers/pinctrl/intel/pinctrl-merrifield.c @@ -12,8 +12,10 @@ #include <linux/module.h> #include <linux/mod_devicetable.h> #include <linux/platform_device.h> -#include <linux/pinctrl/pinconf.h> +#include <linux/seq_file.h> + #include <linux/pinctrl/pinconf-generic.h> +#include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> |