diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /fs | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fs.c | 1 | ||||
| -rw-r--r-- | fs/reiserfs/reiserfs_private.h | 2 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.c | 1 |
3 files changed, 4 insertions, 0 deletions
@@ -20,6 +20,7 @@ #include <sandboxfs.h> #include <ubifs_uboot.h> #include <btrfs.h> +#include <asm/global_data.h> #include <asm/io.h> #include <div64.h> #include <linux/math64.h> diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h index c8867e24fe..5936f21400 100644 --- a/fs/reiserfs/reiserfs_private.h +++ b/fs/reiserfs/reiserfs_private.h @@ -15,6 +15,8 @@ * from the original reiser fs code, as found in the linux kernel. */ +#include <compiler.h> + #ifndef __BYTE_ORDER #if defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN) #define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 70beb848e1..d6be5c947d 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -17,6 +17,7 @@ #include <log.h> #include <malloc.h> #include <memalign.h> +#include <asm/global_data.h> #include "ubifs.h" #include <part.h> #include <dm/devres.h> |