#define YAFFS_PATH_DIVIDERS "/"
-#ifdef NO_Y_INLINE
-#define Y_INLINE
+#ifdef NO_inline
+#define inline
#else
-#define Y_INLINE __inline__
+#define inline __inline__
#endif
-#define kmalloc(x,flags) yaffs_malloc(x)
-#define kfree(x) yaffs_free(x)
-#define vmalloc(x) yaffs_malloc(x)
-#define vfree(x) yaffs_free(x)
+#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)