Merge master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / arch / um / drivers / cow.h

diff --git a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
index 04e3958266e07192c69a1b5ebba418a9e6cd43ed..dc36b222100b9abde780f996407a758f336afce4 100644 (file)
--- a/arch/um/drivers/cow.h
+++ b/arch/um/drivers/cow.h
@@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg);
 extern int read_cow_header(int (*reader)(__u64, char *, int, void *),
                           void *arg, __u32 *version_out,
                           char **backing_file_out, time_t *mtime_out,
-                          __u64 *size_out, int *sectorsize_out,
+                          unsigned long long *size_out, int *sectorsize_out,
                           __u32 *align_out, int *bitmap_offset_out);
 
 extern int write_cow_header(char *cow_file, int fd, char *backing_file,