From: Charles Manning <cdhmanning@gmail.com>
Date: Thu, 14 Jun 2012 01:22:40 +0000 (+1200)
Subject: Merge branch '32-bit-loff_t'
X-Git-Tag: pre-driver-refactoring~6
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=878880321c4fa7ab0e431d22a3dd156a9a272c68

Merge branch '32-bit-loff_t'

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

878880321c4fa7ab0e431d22a3dd156a9a272c68
diff --cc direct/yaffsfs.c
index 61aee74,b418eca..d208e25
--- a/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;