diff options
| author | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/mtd/onenand | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/mtd/onenand')
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_bbt.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_spl.c | 3 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_uboot.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/onenand/samsung.c | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 762b01c1b0f..edecb841338 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -19,7 +19,6 @@ * published by the Free Software Foundation. */ -#include <common.h> #include <log.h> #include <watchdog.h> #include <dm/devres.h> diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index cc1e449f4a7..6af1cb2ec19 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c @@ -14,7 +14,6 @@ * published by the Free Software Foundation. */ -#include <common.h> #include <log.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c index 2699958a5de..a9d54a243ad 100644 --- a/drivers/mtd/onenand/onenand_spl.c +++ b/drivers/mtd/onenand/onenand_spl.c @@ -7,9 +7,10 @@ * Kyungmin Park <[email protected]> */ -#include <common.h> +#include <config.h> #include <asm/io.h> #include <linux/bitops.h> +#include <linux/string.h> #include <linux/mtd/onenand_regs.h> #include <onenand_uboot.h> diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index ecacabefadc..db0ac6c1fb8 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -13,7 +13,7 @@ * OneNAND initialization at U-Boot */ -#include <common.h> +#include <config.h> #include <display_options.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index c415e5149a0..ccfdad4913e 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -9,7 +9,6 @@ * Emulate the pseudo BufferRAM */ -#include <common.h> #include <malloc.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> |