diff options
author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-11-18 11:14:39 +0530 |
---|---|---|
committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-11-18 11:14:39 +0530 |
commit | cfb26ef11de2e16cb7e3e4be2b60513323769a47 (patch) | |
tree | b400e10d51948ec0ed16aada09cd2078c41416d8 /include | |
parent | eab94951f140beb6ed5465208cf0b0bd518b7bdc (diff) | |
parent | 3f396ff1233b0bb54ae492e89293e2204ffa0936 (diff) |
Merge branch android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: Ib01f171e7159768fc5ed3509b5a3e0b987dc57ef
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb/f_mtp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/f_mtp.h b/include/linux/usb/f_mtp.h index 426c6b5cc06a..e4fd88066389 100644 --- a/include/linux/usb/f_mtp.h +++ b/include/linux/usb/f_mtp.h @@ -29,7 +29,7 @@ struct mtp_file_range { /* offset in file for start of transfer */ loff_t offset; /* number of bytes to transfer */ - size_t length; + int64_t length; }; struct mtp_event { |