diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-31 02:49:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-31 02:49:40 +0300 |
| commit | a1c19328a160c80251868dbd80066dce23d07995 (patch) | |
| tree | 13c0b5c8b5e0789b731ff50401e3fc0cc9c8e891 /drivers/soc/aspeed/aspeed-uart-routing.c | |
| parent | 47ca50600efcf994adb62a9a4e75c77d91bd0781 (diff) | |
| parent | 6e73bd23a1cdcf1416ebd57ff673b5f601963ed2 (diff) | |
| download | linux-a1c19328a160c80251868dbd80066dce23d07995.tar.xz | |
Merge tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC cleanups from Arnd Bergmann:
"These are all minor cleanups for platform specific code in arch/arm/
and some of the associated drivers. The majority of these are work
done by Rob Herring to improve the way devicetreee header files are
handled"
* tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (49 commits)
ARM: davinci: Drop unused includes
ARM: s5pv210: Explicitly include correct DT includes
ARM: dove: Drop unused includes
ARM: mvebu: Explicitly include correct DT includes
Documentation/process: maintainer-soc: document dtbs_check requirement for Samsung
MAINTAINER: samsung: document dtbs_check requirement for Samsung
Documentation/process: maintainer-soc: add clean platforms profile
MAINTAINERS: soc: reference maintainer profile
ARM: nspire: Remove unused header file mmio.h
ARM: nspire: Use syscon-reboot to handle restart
soc: fsl: Explicitly include correct DT includes
soc: xilinx: Explicitly include correct DT includes
soc: sunxi: Explicitly include correct DT includes
soc: rockchip: Explicitly include correct DT includes
soc: mediatek: Explicitly include correct DT includes
soc: aspeed: Explicitly include correct DT includes
firmware: Explicitly include correct DT includes
bus: Explicitly include correct DT includes
ARM: spear: Explicitly include correct DT includes
ARM: mvebu: Explicitly include correct DT includes
...
Diffstat (limited to 'drivers/soc/aspeed/aspeed-uart-routing.c')
| -rw-r--r-- | drivers/soc/aspeed/aspeed-uart-routing.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/soc/aspeed/aspeed-uart-routing.c b/drivers/soc/aspeed/aspeed-uart-routing.c index 59123e1f27ac..3a4c1f28cb34 100644 --- a/drivers/soc/aspeed/aspeed-uart-routing.c +++ b/drivers/soc/aspeed/aspeed-uart-routing.c @@ -5,8 +5,7 @@ */ #include <linux/device.h> #include <linux/module.h> -#include <linux/of_device.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> #include <linux/platform_device.h> |