diff options
| author | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
| commit | 7f641d53bbb3a426a3bfb132d8346153e86a9d08 (patch) | |
| tree | e59a0aef74c8742a30a611342d39d7bfe06854dd /fs/ubifs/ubifs.h | |
| parent | 112db9407dd338f71200beb0fc99dffa8dcb57a8 (diff) | |
| parent | 040cc7b3beedecd971274a065564e39aac7fc76e (diff) | |
| download | u-boot-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
Diffstat (limited to 'fs/ubifs/ubifs.h')
| -rw-r--r-- | fs/ubifs/ubifs.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index c12026147f..a51b2376d2 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -31,6 +31,8 @@ #include <linux/backing-dev.h> #include "ubifs-media.h" #else +#include <asm/atomic.h> +#include <asm-generic/atomic-long.h> #include <ubi_uboot.h> #include <linux/ctype.h> @@ -63,16 +65,6 @@ struct page { void iput(struct inode *inode); -/* - * The atomic operations are used for budgeting etc which is not - * needed for the read-only U-Boot implementation: - */ -#define atomic_long_inc(a) -#define atomic_long_dec(a) -#define atomic_long_sub(a, b) - -typedef unsigned long atomic_long_t; - /* linux/include/time.h */ #define NSEC_PER_SEC 1000000000L #define get_seconds() 0 |