diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/usb/class/cdc-acm.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
| -rw-r--r-- | drivers/usb/class/cdc-acm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 05ce308d5d2a..1f1eabfd8462 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h | |||
| @@ -96,7 +96,6 @@ struct acm { | |||
| 96 | struct acm_rb read_buffers[ACM_NR]; | 96 | struct acm_rb read_buffers[ACM_NR]; |
| 97 | struct acm_wb *putbuffer; /* for acm_tty_put_char() */ | 97 | struct acm_wb *putbuffer; /* for acm_tty_put_char() */ |
| 98 | int rx_buflimit; | 98 | int rx_buflimit; |
| 99 | int rx_endpoint; | ||
| 100 | spinlock_t read_lock; | 99 | spinlock_t read_lock; |
| 101 | int write_used; /* number of non-empty write buffers */ | 100 | int write_used; /* number of non-empty write buffers */ |
| 102 | int transmitting; | 101 | int transmitting; |