diff options
| author | Simon Glass <sjg@chromium.org> | 2019-11-14 12:57:16 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-02 18:23:08 -0500 |
| commit | 3db7110857524cf1b7d0a374c1ebcde8a2680de0 (patch) | |
| tree | 050b7a36ff3a6fe08b1a5d30e00daf88c4ca5094 /fs | |
| parent | b2ea91ba57a2c3d57ec3d681b4058b115a0d3e51 (diff) | |
| download | u-boot-3db7110857524cf1b7d0a374c1ebcde8a2680de0.zip u-boot-3db7110857524cf1b7d0a374c1ebcde8a2680de0.tar.gz u-boot-3db7110857524cf1b7d0a374c1ebcde8a2680de0.tar.bz2 | |
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 'fs')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 1 | ||||
| -rw-r--r-- | fs/ubifs/io.c | 1 | ||||
| -rw-r--r-- | fs/ubifs/recovery.c | 1 | ||||
| -rw-r--r-- | fs/ubifs/tnc.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 6bf1943..5912cde 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -118,6 +118,7 @@ #include <linux/compiler.h> #include <linux/stat.h> #include <linux/time.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <jffs2/jffs2.h> #include <jffs2/jffs2_1pass.h> diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 8d7f8fe..7fe94e1 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -61,6 +61,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/compat.h> #include <linux/err.h> diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 621804c..b568012 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -38,6 +38,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/err.h> #endif diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 86774f8..8afc08a 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -21,6 +21,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/compat.h> #include <linux/err.h> |