diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 12:07:58 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 12:07:58 +0200 |
commit | 347cdfc86b0c6b869722d02ba2bde421099621c9 (patch) | |
tree | 401f100072b51e4c93dd3476887f30e8c9f2b9c5 /drivers/soc | |
parent | f1c047c2f7dd9337441f6711733bb79ac4d7d2e7 (diff) | |
parent | 23e9bf8e78ba2ed32e9bf5a37c5074b9dfc29110 (diff) |
Merge tag 'sunxi-drivers-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers
- simplify code in sunxi-rsb
- fix includes in sunxi_sram
* tag 'sunxi-drivers-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
soc: sunxi: Explicitly include correct DT includes
bus: sunxi-rsb: Convert to devm_platform_ioremap_resource()
Link: https://lore.kernel.org/r/20230806180650.GA127142@jernej-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
-rw-r--r-- | drivers/soc/sunxi/sunxi_sram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 4c4864cd2342..4458b2e0562b 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -15,7 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/regmap.h> |