Merge branch '32-bit-loff_t'

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --cc direct/yaffsfs.c
index 61aee74710a92146a35d3b9d911e1adbfafb1c3c,b418ecaaacf724c1943f9841031af81f973fa0a6..d208e25df0b4fdf002bae73547caddcbc7892107
--- 1/direct/yaffsfs.c
--- 2/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@@ -1063,8 -1063,8 +1063,8 @@@ int yaffs_close(int handle
        return retVal;
  }
  
 -int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
 +static int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
-                   int isPread, loff_t offset)
+                   int isPread, Y_LOFF_T offset)
  {
        struct yaffsfs_FileDes *fd = NULL;
        struct yaffs_obj *obj = NULL;
@@@ -1185,8 -1185,8 +1185,8 @@@ int yaffs_pread(int handle, void *buf, 
        return yaffsfs_do_read(handle, buf, nbyte, 1, offset);
  }
  
 -int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
 +static int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
-                    int isPwrite, loff_t offset)
+                    int isPwrite, Y_LOFF_T offset)
  {
        struct yaffsfs_FileDes *fd = NULL;
        struct yaffs_obj *obj = NULL;

diff --cc yaffs_guts.c
Simple merge