aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-14 16:58:45 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-08-14 16:58:45 -0400
commitd2dcd9101b1a940ce8496601ba871e47f84881ec (patch)
tree3de9cb11379d51eb01b568a20c8d7c585c89d10e /drivers/usb/class/cdc-acm.h
parent8010fbe7a67c2f993cbb11b9d8b7e98528256dd1 (diff)
parent606b4c992f3b28f906100f1b6eb49059909d8da7 (diff)
Merge branch 'master' into sh/cachetlb
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
-rw-r--r--drivers/usb/class/cdc-acm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 1602324808ba..c4a0ee8ffccf 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -126,6 +126,8 @@ struct acm {
126 unsigned int ctrl_caps; /* control capabilities from the class specific header */ 126 unsigned int ctrl_caps; /* control capabilities from the class specific header */
127 unsigned int susp_count; /* number of suspended interfaces */ 127 unsigned int susp_count; /* number of suspended interfaces */
128 int combined_interfaces:1; /* control and data collapsed */ 128 int combined_interfaces:1; /* control and data collapsed */
129 int is_int_ep:1; /* interrupt endpoints contrary to spec used */
130 u8 bInterval;
129 struct acm_wb *delayed_wb; /* write queued for a device about to be woken */ 131 struct acm_wb *delayed_wb; /* write queued for a device about to be woken */
130}; 132};
131 133