Merge branch 'mainlining'

[yaffs2.git] / yaffs_getblockinfo.h

diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h
index 4cef6863fdfd31ba4e483e3562c2167fda8eeeb2..d87acbde997cf741996eec715f4579bc4802294b 100644 (file)
--- a/yaffs_getblockinfo.h
+++ b/yaffs_getblockinfo.h
@@ -20,7 +20,7 @@
 #include "yaffs_trace.h"
 
 /* Function to manipulate block info */
-static Y_INLINE struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
+static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
                                                              *dev, int blk)
 {
        if (blk < dev->internal_start_block || blk > dev->internal_end_block) {