diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 12:28:09 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 12:28:10 +0100 |
| commit | 54721ff7d696b02b994fa736cd6613758078017b (patch) | |
| tree | 81957135393ceeabe60ef2a5341d26f4e0454044 /arch | |
| parent | b8d0b1bef204037567b5eefae3270747577c3554 (diff) | |
| parent | 72684faf703cbb12ec944df91f45949973f2d6f7 (diff) | |
| download | linux-stable-54721ff7d696b02b994fa736cd6613758078017b.tar.gz linux-stable-54721ff7d696b02b994fa736cd6613758078017b.tar.bz2 linux-stable-54721ff7d696b02b994fa736cd6613758078017b.zip | |
Merge tag 'imx-soc-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc
i.MX SoC change for 6.2:
- A couple of cleanups from Geert Uytterhoeven to drop unneeded include
of pinctrl machine header from i.MX3 and MXS code.
* tag 'imx-soc-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx3: Remove unneeded #include <linux/pinctrl/machine.h>
ARM: mxs: Remove unneeded #include <linux/pinctrl/consumer.h>
Link: https://lore.kernel.org/r/20221119125733.32719-2-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx3.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index 28db97289ee8..0788c5cc7f9e 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c @@ -12,7 +12,6 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/of_address.h> -#include <linux/pinctrl/machine.h> #include <asm/system_misc.h> #include <asm/hardware/cache-l2x0.h> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 25c9d184fa4c..02afedcc9418 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -17,7 +17,6 @@ #include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/phy.h> -#include <linux/pinctrl/consumer.h> #include <linux/sys_soc.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> |