fix patch, after aufs2 addition

2 files changed, 54 insertions, 51 deletions

diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 6ce885677..f6da0d980 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -151,7 +151,7 @@ config ADK_KPACKAGE_KMOD_NTFS_FS
 	  Kernel modules for NTFS support
 
 config ADK_KPACKAGE_KMOD_VFAT_FS
-	prompt "kmod-vfat-fs....................... VFAT filesystem support"
+	prompt "kmod-vfat-fs...................... VFAT filesystem support"
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
diff --git a/target/linux/patches/2.6.36/yaffs2.patch b/target/linux/patches/2.6.36/yaffs2.patch
index ab8924e0f..4a52d3f10 100644
--- a/target/linux/patches/2.6.36/yaffs2.patch
+++ b/target/linux/patches/2.6.36/yaffs2.patch
@@ -1,6 +1,6 @@
 diff -Nur linux-2.6.36.orig/fs/Kconfig linux-2.6.36/fs/Kconfig
---- linux-2.6.36.orig/fs/Kconfig	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/fs/Kconfig	2010-11-18 18:15:51.000000000 +0100
+--- linux-2.6.36.orig/fs/Kconfig	2011-01-10 19:28:45.000000000 +0100
++++ linux-2.6.36/fs/Kconfig	2011-01-10 19:29:29.000000000 +0100
 @@ -174,6 +174,7 @@
  source "fs/befs/Kconfig"
  source "fs/bfs/Kconfig"
@@ -10,16 +10,19 @@ diff -Nur linux-2.6.36.orig/fs/Kconfig linux-2.6.36/fs/Kconfig
  # UBIFS File system configuration
  source "fs/ubifs/Kconfig"
 diff -Nur linux-2.6.36.orig/fs/Makefile linux-2.6.36/fs/Makefile
---- linux-2.6.36.orig/fs/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/fs/Makefile	2010-11-18 18:15:51.000000000 +0100
-@@ -126,3 +126,4 @@
+--- linux-2.6.36.orig/fs/Makefile	2011-01-10 19:28:45.000000000 +0100
++++ linux-2.6.36/fs/Makefile	2011-01-10 19:30:04.000000000 +0100
+@@ -124,6 +124,7 @@
+ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+ obj-$(CONFIG_BTRFS_FS)		+= btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
  obj-$(CONFIG_EXOFS_FS)          += exofs/
  obj-$(CONFIG_CEPH_FS)		+= ceph/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
+ obj-$(CONFIG_AUFS_FS)           += aufs/
 diff -Nur linux-2.6.36.orig/fs/yaffs2/Kconfig linux-2.6.36/fs/yaffs2/Kconfig
 --- linux-2.6.36.orig/fs/yaffs2/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/Kconfig	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/Kconfig	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,161 @@
 +#
 +# YAFFS file system configurations
@@ -184,7 +187,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/Kconfig linux-2.6.36/fs/yaffs2/Kconfig
 +	 If unsure, say Y.
 diff -Nur linux-2.6.36.orig/fs/yaffs2/Makefile linux-2.6.36/fs/yaffs2/Makefile
 --- linux-2.6.36.orig/fs/yaffs2/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/Makefile	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/Makefile	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,17 @@
 +#
 +# Makefile for the linux YAFFS filesystem routines.
@@ -205,7 +208,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/Makefile linux-2.6.36/fs/yaffs2/Makefile
 +
 diff -Nur linux-2.6.36.orig/fs/yaffs2/moduleconfig.h linux-2.6.36/fs/yaffs2/moduleconfig.h
 --- linux-2.6.36.orig/fs/yaffs2/moduleconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/moduleconfig.h	2010-11-18 18:49:02.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/moduleconfig.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,81 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -290,7 +293,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/moduleconfig.h linux-2.6.36/fs/yaffs2/modu
 +#endif /* __YAFFS_CONFIG_H__ */
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.c linux-2.6.36/fs/yaffs2/yaffs_allocator.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_allocator.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_allocator.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,397 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -691,7 +694,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.c linux-2.6.36/fs/yaffs2/y
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.h linux-2.6.36/fs/yaffs2/yaffs_allocator.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_allocator.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_allocator.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,30 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -725,7 +728,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_allocator.h linux-2.6.36/fs/yaffs2/y
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.c linux-2.6.36/fs/yaffs2/yaffs_attribs.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_attribs.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_attribs.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,124 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -853,7 +856,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.c linux-2.6.36/fs/yaffs2/yaf
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.h linux-2.6.36/fs/yaffs2/yaffs_attribs.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_attribs.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_attribs.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,28 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -885,7 +888,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_attribs.h linux-2.6.36/fs/yaffs2/yaf
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.c linux-2.6.36/fs/yaffs2/yaffs_bitmap.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_bitmap.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_bitmap.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,104 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -993,7 +996,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.c linux-2.6.36/fs/yaffs2/yaff
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.h linux-2.6.36/fs/yaffs2/yaffs_bitmap.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_bitmap.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_bitmap.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,33 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -1030,7 +1033,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_bitmap.h linux-2.6.36/fs/yaffs2/yaff
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.36/fs/yaffs2/yaffs_checkptrw.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_checkptrw.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_checkptrw.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,420 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -1454,7 +1457,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.36/fs/yaffs2/y
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.36/fs/yaffs2/yaffs_checkptrw.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_checkptrw.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_checkptrw.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,33 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -1491,7 +1494,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.36/fs/yaffs2/y
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.36/fs/yaffs2/yaffs_ecc.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_ecc.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_ecc.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,322 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -1817,7 +1820,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.36/fs/yaffs2/yaffs_e
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.36/fs/yaffs2/yaffs_ecc.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_ecc.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_ecc.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,44 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -1865,7 +1868,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.36/fs/yaffs2/yaffs_e
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.36/fs/yaffs2/yaffs_getblockinfo.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_getblockinfo.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_getblockinfo.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_getblockinfo.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,36 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -1905,7 +1908,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.36/fs/yaffs
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_guts.c linux-2.6.36/fs/yaffs2/yaffs_guts.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_guts.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_guts.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_guts.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,5227 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -7136,7 +7139,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_guts.c linux-2.6.36/fs/yaffs2/yaffs_
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_guts.h linux-2.6.36/fs/yaffs2/yaffs_guts.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_guts.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_guts.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_guts.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,914 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -8054,7 +8057,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_guts.h linux-2.6.36/fs/yaffs2/yaffs_
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_linux.h linux-2.6.36/fs/yaffs2/yaffs_linux.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_linux.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_linux.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_linux.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,41 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -8099,7 +8102,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_linux.h linux-2.6.36/fs/yaffs2/yaffs
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.36/fs/yaffs2/yaffs_mtdif.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_mtdif.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,54 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -8157,7 +8160,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.36/fs/yaffs2/yaffs
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.36/fs/yaffs2/yaffs_mtdif.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_mtdif.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,23 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -8184,7 +8187,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.36/fs/yaffs2/yaffs
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.36/fs/yaffs2/yaffs_mtdif1.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_mtdif1.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif1.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,365 @@
 +/*
 + * YAFFS: Yet another FFS. A NAND-flash specific file system.
@@ -8553,7 +8556,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.36/fs/yaffs2/yaff
 +#endif /*MTD_VERSION */
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.36/fs/yaffs2/yaffs_mtdif1.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_mtdif1.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif1.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,29 @@
 +/*
 + * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
@@ -8586,7 +8589,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.36/fs/yaffs2/yaff
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.36/fs/yaffs2/yaffs_mtdif2.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_mtdif2.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif2.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,261 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -8851,7 +8854,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.36/fs/yaffs2/yaff
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.36/fs/yaffs2/yaffs_mtdif2.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_mtdif2.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_mtdif2.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,29 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -8884,7 +8887,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.36/fs/yaffs2/yaff
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.c linux-2.6.36/fs/yaffs2/yaffs_nameval.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_nameval.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nameval.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,201 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -9089,7 +9092,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.c linux-2.6.36/fs/yaffs2/yaf
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.h linux-2.6.36/fs/yaffs2/yaffs_nameval.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_nameval.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nameval.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,28 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -9121,7 +9124,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nameval.h linux-2.6.36/fs/yaffs2/yaf
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nand.c linux-2.6.36/fs/yaffs2/yaffs_nand.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_nand.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_nand.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nand.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,128 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -9253,7 +9256,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nand.c linux-2.6.36/fs/yaffs2/yaffs_
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nand.h linux-2.6.36/fs/yaffs2/yaffs_nand.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_nand.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_nand.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_nand.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,38 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -9295,7 +9298,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_nand.h linux-2.6.36/fs/yaffs2/yaffs_
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.36/fs/yaffs2/yaffs_packedtags1.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_packedtags1.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags1.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,53 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -9352,7 +9355,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.36/fs/yaffs2
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.36/fs/yaffs2/yaffs_packedtags1.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_packedtags1.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags1.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,39 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -9395,7 +9398,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.36/fs/yaffs2
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.36/fs/yaffs2/yaffs_packedtags2.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_packedtags2.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags2.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,197 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -9596,7 +9599,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.36/fs/yaffs2
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.36/fs/yaffs2/yaffs_packedtags2.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_packedtags2.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_packedtags2.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -9647,7 +9650,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.36/fs/yaffs2
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.36/fs/yaffs2/yaffs_tagscompat.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_tagscompat.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagscompat.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,454 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -10105,7 +10108,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.36/fs/yaffs2/
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.36/fs/yaffs2/yaffs_tagscompat.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_tagscompat.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagscompat.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,36 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -10145,7 +10148,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.36/fs/yaffs2/
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,27 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -10176,7 +10179,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.36/fs/yaffs
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_tagsvalidity.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,23 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -10203,7 +10206,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.36/fs/yaffs
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_trace.h linux-2.6.36/fs/yaffs2/yaffs_trace.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_trace.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_trace.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_trace.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,59 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -10266,7 +10269,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_trace.h linux-2.6.36/fs/yaffs2/yaffs
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_verify.c linux-2.6.36/fs/yaffs2/yaffs_verify.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_verify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_verify.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_verify.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,546 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -10816,7 +10819,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_verify.c linux-2.6.36/fs/yaffs2/yaff
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_verify.h linux-2.6.36/fs/yaffs2/yaffs_verify.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_verify.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_verify.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_verify.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,43 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -10863,7 +10866,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_verify.h linux-2.6.36/fs/yaffs2/yaff
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_vfs.c linux-2.6.36/fs/yaffs2/yaffs_vfs.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_vfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_vfs.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_vfs.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,3565 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -14432,7 +14435,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_vfs.c linux-2.6.36/fs/yaffs2/yaffs_v
 +MODULE_LICENSE("GPL");
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.c linux-2.6.36/fs/yaffs2/yaffs_yaffs1.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_yaffs1.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs1.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,437 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -14873,7 +14876,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.c linux-2.6.36/fs/yaffs2/yaff
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.h linux-2.6.36/fs/yaffs2/yaffs_yaffs1.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_yaffs1.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs1.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,22 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -14899,7 +14902,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs1.h linux-2.6.36/fs/yaffs2/yaff
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.c linux-2.6.36/fs/yaffs2/yaffs_yaffs2.c
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_yaffs2.c	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs2.c	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,1620 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -16523,7 +16526,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.c linux-2.6.36/fs/yaffs2/yaff
 +}
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.h linux-2.6.36/fs/yaffs2/yaffs_yaffs2.h
 --- linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yaffs_yaffs2.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yaffs_yaffs2.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,39 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@@ -16566,7 +16569,7 @@ diff -Nur linux-2.6.36.orig/fs/yaffs2/yaffs_yaffs2.h linux-2.6.36/fs/yaffs2/yaff
 +#endif
 diff -Nur linux-2.6.36.orig/fs/yaffs2/yportenv.h linux-2.6.36/fs/yaffs2/yportenv.h
 --- linux-2.6.36.orig/fs/yaffs2/yportenv.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/fs/yaffs2/yportenv.h	2010-11-18 18:15:51.000000000 +0100
++++ linux-2.6.36/fs/yaffs2/yportenv.h	2011-01-10 19:29:29.000000000 +0100
 @@ -0,0 +1,339 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.