diff -urN mtd.old/include/asm/types.h mtd.dev/include/asm/types.h --- mtd.old/include/asm/types.h 1970-01-01 01:00:00.000000000 +0100 +++ mtd.dev/include/asm/types.h 2006-09-27 16:50:03.000000000 +0200 @@ -0,0 +1,3 @@ +#ifdef linux +#include_next +#endif diff -urN mtd.old/util/mkfs.jffs2.c mtd.dev/util/mkfs.jffs2.c --- mtd.old/util/mkfs.jffs2.c 2004-11-27 00:00:13.000000000 +0100 +++ mtd.dev/util/mkfs.jffs2.c 2006-09-27 16:51:56.000000000 +0200 @@ -68,6 +68,7 @@ #include #undef crc32 #include "crc32.h" +#include /* Do not use the wierd XPG version of basename */ #undef basename @@ -1032,7 +1033,7 @@ case S_IFDIR: if (verbose) { printf("\td %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, e->sb.st_size, + e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, (int) (e->sb.st_uid), (int) (e->sb.st_gid), e->name); } @@ -1041,7 +1042,7 @@ case S_IFSOCK: if (verbose) { printf("\ts %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, e->sb.st_size, + e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); } write_pipe(e); @@ -1049,7 +1050,7 @@ case S_IFIFO: if (verbose) { printf("\tp %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, e->sb.st_size, + e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); } write_pipe(e); @@ -1075,7 +1076,7 @@ case S_IFLNK: if (verbose) { printf("\tl %04o %9lu %5d:%-3d %s -> %s\n", - e->sb.st_mode & ~S_IFMT, e->sb.st_size, + e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name, e->link); } @@ -1084,7 +1085,7 @@ case S_IFREG: if (verbose) { printf("\tf %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, e->sb.st_size, + e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); } write_regular_file(e);