Add missing #include file: yaffs_nandemul2k.h and removing a macro which is now redef...

[yaffs2.git] / mtdemul / nandemul2k.c

diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c
index 2980f9adcb791521e6798de634f5210b9e2a729f..7ee030836b08d4910ab39067231e4acb98a0b823 100644 (file)
--- a/mtdemul/nandemul2k.c
+++ b/mtdemul/nandemul2k.c
@@ -27,14 +27,16 @@
 #include <linux/mtd/mtd.h>
 #include <linux/interrupt.h>
 #include <linux/string.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include <linux/locks.h>
+#endif
 
 #include <asm/uaccess.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
+#include "../yaffs_nandemul2k.h"
 
-#define T(f,x) printk x
 #define ALLOCATE(x) kmalloc(x,GFP_KERNEL)
 #define FREE(x)     kfree(x)