initial import

[patches.git] / uclinux-flashw-cleanup.patch

Index: user/flashw/flashw.c
===================================================================
RCS file: /var/cvs/uClinux-dist/user/flashw/flashw.c,v
retrieving revision 1.1.1.6
diff -u -p -r1.1.1.6 flashw.c
--- user/flashw/flashw.c	12 Jul 2006 05:10:36 -0000	1.1.1.6
+++ user/flashw/flashw.c	7 Jan 2007 13:59:22 -0000
@@ -10,6 +10,7 @@
 
 /*****************************************************************************/
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -20,20 +21,23 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <linux/config.h>
 #include <linux/version.h>
-#ifdef CONFIG_MTD
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8)
-#include <mtd/mtd-user.h>
-#else 
-#include <linux/mtd/mtd.h>
-#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+# include <mtd/mtd-user.h>
+# define CONFIG_MTD
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8)
+# include <linux/config.h>
+# ifdef CONFIG_MTD
+#  include <mtd/mtd-user.h>
+# else 
+#  include <linux/mtd/mtd.h>
+# endif
 #else
-#include <linux/blkmem.h>
+# include <linux/blkmem.h>
 #endif
 #if defined(CONFIG_NFTL_RW) && !defined(NFTL_MAJOR)
- #define NFTL_MAJOR 93
- #include <sys/mount.h>
+# define NFTL_MAJOR 93
+# include <sys/mount.h>
 #endif
 #include <dirent.h>