diff options
| author | Simon Glass | 2019-11-14 12:57:16 -0700 |
|---|---|---|
| committer | Tom Rini | 2019-12-02 18:23:08 -0500 |
| commit | 3db7110857524cf1b7d0a374c1ebcde8a2680de0 (patch) | |
| tree | 050b7a36ff3a6fe08b1a5d30e00daf88c4ca5094 /drivers/mtd/ubi | |
| parent | b2ea91ba57a2c3d57ec3d681b4058b115a0d3e51 (diff) | |
crc32: Use the crc.h header for crc functions
Drop inclusion of crc.h in common.h and use the correct header directly
instead.
With this we can drop the conflicting definition in fw_env.h and rely on
the crc.h header, which is already included.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/mtd/ubi')
| -rw-r--r-- | drivers/mtd/ubi/attach.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/crc32.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/eba.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/fastmap.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/io.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/vtbl.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index b4ba339c804..19defd88318 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -74,6 +74,7 @@ #include <linux/slab.h> #include <linux/crc32.h> #include <linux/random.h> +#include <u-boot/crc.h> #else #include <div64.h> #include <linux/err.h> diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c index 9c54ea4db0c..9ce061c8613 100644 --- a/drivers/mtd/ubi/crc32.c +++ b/drivers/mtd/ubi/crc32.c @@ -25,6 +25,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/compiler.h> +#include <u-boot/crc.h> #endif #include <linux/types.h> diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 809782b3726..0c8b998e7e1 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -31,6 +31,7 @@ #ifndef __UBOOT__ #include <linux/slab.h> #include <linux/crc32.h> +#include <u-boot/crc.h> #else #include <ubi_uboot.h> #endif diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 14368f9738c..646c778e87c 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -8,6 +8,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> +#include <u-boot/crc.h> #else #include <div64.h> #include <malloc.h> diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 688fb509d2c..608dede4925 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -77,6 +77,7 @@ #include <linux/crc32.h> #include <linux/err.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <hexdump.h> #include <ubi_uboot.h> diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index fb535c1a878..9c46ef66956 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -50,6 +50,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <asm/div64.h> +#include <u-boot/crc.h> #else #include <ubi_uboot.h> #endif |