diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /drivers/mtd/nand/spi | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'drivers/mtd/nand/spi')
| -rw-r--r-- | drivers/mtd/nand/spi/core.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/spi/macronix.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/spi/micron.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/spi/toshiba.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/spi/winbond.c | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 397dfa41789..93371fdde07 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -26,6 +26,8 @@ #include <spi-mem.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bitops.h> +#include <linux/bug.h> #include <linux/mtd/spinand.h> #endif diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c index 67d092be2cf..215f09acc37 100644 --- a/drivers/mtd/nand/spi/macronix.c +++ b/drivers/mtd/nand/spi/macronix.c @@ -10,6 +10,7 @@ #include <linux/device.h> #include <linux/kernel.h> #endif +#include <linux/bug.h> #include <linux/mtd/spinand.h> #define SPINAND_MFR_MACRONIX 0xC2 diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c index 687306e33e6..04de51cb466 100644 --- a/drivers/mtd/nand/spi/micron.c +++ b/drivers/mtd/nand/spi/micron.c @@ -11,6 +11,7 @@ #include <linux/device.h> #include <linux/kernel.h> #endif +#include <linux/bitops.h> #include <linux/mtd/spinand.h> #define SPINAND_MFR_MICRON 0x2c diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c index 77c25398fcc..c4beefa6176 100644 --- a/drivers/mtd/nand/spi/toshiba.c +++ b/drivers/mtd/nand/spi/toshiba.c @@ -11,6 +11,7 @@ #include <linux/device.h> #include <linux/kernel.h> #endif +#include <linux/bug.h> #include <linux/mtd/spinand.h> #define SPINAND_MFR_TOSHIBA 0x98 diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c index 6ede98c85d2..c119486efb7 100644 --- a/drivers/mtd/nand/spi/winbond.c +++ b/drivers/mtd/nand/spi/winbond.c @@ -12,6 +12,7 @@ #include <linux/device.h> #include <linux/kernel.h> #endif +#include <linux/bitops.h> #include <linux/mtd/spinand.h> #define SPINAND_MFR_WINBOND 0xEF |