diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2010-11-17 13:20:43 -0800 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2010-11-17 13:20:43 -0800 |
| commit | 71cf8afb3cdb34d196c397dd59a75b0a6247fcf7 (patch) | |
| tree | 48f87ae23ec53e162d4998053f1dbd8f0619a151 /include | |
| parent | 6ee219d7ca3c708c93928fa4aaeb52b203d0cdab (diff) | |
| parent | f0dc37c24c579c343e4f64386306d57972cf0e0b (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
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 { |