From cf713ba71a29d0857ee4faa2f7071755a68fadc0 Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Fri, 2 Apr 2010 15:34:10 -0700 Subject: [PATCH] --- yaml --- r: 195391 b: refs/heads/master c: 94af1220985c71cd80d6c161b7a42c51ef08b923 h: refs/heads/master i: 195389: 820c3a70b553ae684cd839dab5fe54a2f89cc035 195387: b5c614d72d58c418e9b284206e242018c210962e 195383: 18840e4aa812c1feb43ada1a8447761361f4871f 195375: 89d9d673ef49d70a9afe9bc4911bbdd67a5a2e44 195359: e3e079dedf27f914e8518f98226bc7ad9e44f9f5 195327: 184b6469b15d6ca747b06b803f2d9bef1d0d2602 v: v3 --- [refs] | 2 +- trunk/include/linux/usb.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 95668517bb23..71d8e85818f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22ad1e7f86e1fb96488d71512e2797153a6ad839 +refs/heads/master: 94af1220985c71cd80d6c161b7a42c51ef08b923 diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index e32a849f81ce..191af498c4f5 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -1196,6 +1196,7 @@ struct urb { struct usb_device *dev; /* (in) pointer to associated device */ struct usb_host_endpoint *ep; /* (internal) pointer to endpoint */ unsigned int pipe; /* (in) pipe information */ + unsigned int stream_id; /* (in) stream ID */ int status; /* (return) non-ISO status */ unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/ void *transfer_buffer; /* (in) associated data buffer */