diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:41 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:41 +0900 |
commit | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (patch) | |
tree | 03da91192242b6467d4f2d9d0b26f11f4da55c0c /include/linux/usb/serial.h | |
parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
parent | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (diff) |
Merge branches 'sh/g3-prep' and 'sh/stable-updates'
Diffstat (limited to 'include/linux/usb/serial.h')
-rw-r--r-- | include/linux/usb/serial.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index acf6e457c04b..1819396ed501 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -16,6 +16,7 @@ #include <linux/kref.h> #include <linux/mutex.h> #include <linux/sysrq.h> +#include <linux/kfifo.h> #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ #define SERIAL_TTY_MINORS 254 /* loads of devices :) */ @@ -94,7 +95,7 @@ struct usb_serial_port { unsigned char *bulk_out_buffer; int bulk_out_size; struct urb *write_urb; - struct kfifo *write_fifo; + struct kfifo write_fifo; int write_urb_busy; __u8 bulk_out_endpointAddress; |