diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-20 14:22:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-20 14:22:56 -0800 |
| commit | 8440ffcd68c644e846ce6b23ff13b348d49b2abf (patch) | |
| tree | 814f6ce64d4a657b23f8fa4e857241321fee5431 /drivers/pinctrl/nomadik/pinctrl-ab8500.c | |
| parent | 8974efaa3385959e7ea1019a4b63acff28631e6d (diff) | |
| parent | 431d1531466033909d2e8c754a7dc3704b70843f (diff) | |
| download | linux-8440ffcd68c644e846ce6b23ff13b348d49b2abf.tar.gz linux-8440ffcd68c644e846ce6b23ff13b348d49b2abf.tar.bz2 linux-8440ffcd68c644e846ce6b23ff13b348d49b2abf.zip | |
Merge tag 'pinctrl-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
- Compilation fix for Sunplus sp7021
- Add some missing headers after a cleanup to the Nomadik driver
- Fix pull type and mux routes on Rockchip RK3568
* tag 'pinctrl-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: rockchip: fix mux route data for rk3568
pinctrl: rockchip: fix reading pull type on rk3568
pinctrl: nomadik: Add missing header(s)
pinctrl: sp7021: fix unused function warning
Diffstat (limited to 'drivers/pinctrl/nomadik/pinctrl-ab8500.c')
| -rw-r--r-- | drivers/pinctrl/nomadik/pinctrl-ab8500.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-ab8500.c b/drivers/pinctrl/nomadik/pinctrl-ab8500.c index 3106a21cd277..d7b244df058f 100644 --- a/drivers/pinctrl/nomadik/pinctrl-ab8500.c +++ b/drivers/pinctrl/nomadik/pinctrl-ab8500.c @@ -6,9 +6,10 @@ */ #include <linux/kernel.h> -#include <linux/gpio/driver.h> #include <linux/pinctrl/pinctrl.h> + #include <linux/mfd/abx500/ab8500.h> + #include "pinctrl-abx500.h" /* All the pins that can be used for GPIO and some other functions */ |