diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /drivers/usb/serial/ir-usb.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/ir-usb.c')
| -rw-r--r-- | drivers/usb/serial/ir-usb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 66009b6b763a..95d8d26b9a44 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c | |||
| @@ -86,8 +86,7 @@ static int buffer_size; | |||
| 86 | static int xbof = -1; | 86 | static int xbof = -1; |
| 87 | 87 | ||
| 88 | static int ir_startup (struct usb_serial *serial); | 88 | static int ir_startup (struct usb_serial *serial); |
| 89 | static int ir_open(struct tty_struct *tty, struct usb_serial_port *port, | 89 | static int ir_open(struct tty_struct *tty, struct usb_serial_port *port); |
| 90 | struct file *filep); | ||
| 91 | static void ir_close(struct usb_serial_port *port); | 90 | static void ir_close(struct usb_serial_port *port); |
| 92 | static int ir_write(struct tty_struct *tty, struct usb_serial_port *port, | 91 | static int ir_write(struct tty_struct *tty, struct usb_serial_port *port, |
| 93 | const unsigned char *buf, int count); | 92 | const unsigned char *buf, int count); |
| @@ -296,8 +295,7 @@ static int ir_startup(struct usb_serial *serial) | |||
| 296 | return 0; | 295 | return 0; |
| 297 | } | 296 | } |
| 298 | 297 | ||
| 299 | static int ir_open(struct tty_struct *tty, | 298 | static int ir_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 300 | struct usb_serial_port *port, struct file *filp) | ||
| 301 | { | 299 | { |
| 302 | char *buffer; | 300 | char *buffer; |
| 303 | int result = 0; | 301 | int result = 0; |