diff options
| author | Charles Manning <cdhmanning@gmail.com> | 2012-08-14 18:26:10 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-02 16:47:50 +0200 |
| commit | 74f45b739be635eaa4ec3a40dec6ad66084748c4 (patch) | |
| tree | e67a5514834cd8e6bd5c36d93703004d7aa2919a /fs/yaffs2/ydirectenv.h | |
| parent | 7cdcaef0b286fa20926d750304442ad770a1fca8 (diff) | |
| download | u-boot-74f45b739be635eaa4ec3a40dec6ad66084748c4.tar.gz | |
u-boot yaffs2: Fix compilation warnings
Also remove yaffs_hweight and use the hweight in u-boot.
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'fs/yaffs2/ydirectenv.h')
| -rw-r--r-- | fs/yaffs2/ydirectenv.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h index df0b8fb1c2..c912b09a40 100644 --- a/fs/yaffs2/ydirectenv.h +++ b/fs/yaffs2/ydirectenv.h @@ -20,15 +20,14 @@ #ifndef __YDIRECTENV_H__ #define __YDIRECTENV_H__ -#include "stdlib.h" -#include "stdio.h" -#include "string.h" +#include <common.h> +#include <malloc.h> +#include <linux/compat.h> + #include "yaffs_osglue.h" -#include "yaffs_hweight.h" void yaffs_bug_fn(const char *file_name, int line_no); -#define BUG() do { yaffs_bug_fn(__FILE__, __LINE__); } while (0) #define YCHAR char @@ -47,8 +46,6 @@ void yaffs_bug_fn(const char *file_name, int line_no); #define yaffs_strncmp(a, b, c) strncmp(a, b, c) #endif -#define hweight8(x) yaffs_hweight8(x) -#define hweight32(x) yaffs_hweight32(x) void yaffs_qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *)); @@ -63,11 +60,6 @@ void yaffs_qsort(void *aa, size_t n, size_t es, #define inline __inline__ #endif -#define kmalloc(x, flags) yaffsfs_malloc(x) -#define kfree(x) yaffsfs_free(x) -#define vmalloc(x) yaffsfs_malloc(x) -#define vfree(x) yaffsfs_free(x) - #define cond_resched() do {} while (0) #define yaffs_trace(msk, fmt, ...) do { \ |