X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=fs%2Fyaffs2%2Fydirectenv.h;h=2b3e84fd383fd5ebe23338713d71bb5da0da562a;hb=16ce6de87ecddc73943cd192195bb20148e80622;hp=c912b09a40d237c7a17a38359bccf89a10a337cf;hpb=5675b509165b67465a20e5cf71e07f40b449ef0c;p=u-boot

diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index c912b09a40..2b3e84fd38 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -56,12 +56,8 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 
 #ifdef NO_inline
 #define inline
-#else
-#define inline __inline__
 #endif
 
-#define cond_resched()  do {} while (0)
-
 #define yaffs_trace(msk, fmt, ...) do { \
 	if (yaffs_trace_mask & (msk)) \
 		printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
@@ -79,7 +75,7 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 #define YAFFS_ROOT_MODE			0666
 #define YAFFS_LOSTNFOUND_MODE		0666
 
-#include "yaffs_list.h"
+#include "linux/list.h"
 
 #include "yaffsfs.h"