Unverified Commit 54721ff7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-6.2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents b8d0b1be 72684faf

arch/arm/mach-imx/mm-imx3.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-mxs/mach-mxs.c

+0 −1
Original line number Diff line number Diff line
@@ -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>