Upstream sync
diff --git a/ChangeLog b/ChangeLog
index b7c0e01..da33436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-14 Linus Walleij <triad@df.lth.se>
+
+ * src/ptp.h: sync in upstream to get cancellation prototypes.
+
2007-09-12 Marcus Meissner <meissner@suse.de>
* src/ptp-pack.c: sync to upstream, rewrote packing to use
diff --git a/src/ptp.h b/src/ptp.h
index 3fab012..0cabce6 100644
--- a/src/ptp.h
+++ b/src/ptp.h
@@ -492,6 +492,7 @@
#define PTP_ERROR_DATA_EXPECTED 0x02FE
#define PTP_ERROR_RESP_EXPECTED 0x02FD
#define PTP_ERROR_BADPARAM 0x02FC
+#define PTP_ERROR_CANCEL 0x02FB
/* PTP Event Codes */
@@ -1561,6 +1562,7 @@
uint16_t ptp_usb_control_get_extended_event_data (PTPParams *params, char *buffer, int *size);
uint16_t ptp_usb_control_device_reset_request (PTPParams *params);
uint16_t ptp_usb_control_get_device_status (PTPParams *params, char *buffer, int *size);
+uint16_t ptp_usb_control_cancel_request (PTPParams *params, uint32_t transid);
int ptp_ptpip_connect (PTPParams* params, const char *port);