diff options
author | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
commit | 02e2407858fd62053bf60349c0e72cd1c7a4a60e (patch) | |
tree | 0ebdbddc97d3abbc675916010e7771065b70c137 /drivers/usb/class/cdc-acm.c | |
parent | 96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9 (diff) | |
parent | 6447f55da90b77faec1697d499ed7986bb4f6de6 (diff) |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 4ab49d4eebf4..f492a7f2b6ee 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -776,7 +776,7 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state) | |||
776 | return retval; | 776 | return retval; |
777 | } | 777 | } |
778 | 778 | ||
779 | static int acm_tty_tiocmget(struct tty_struct *tty, struct file *file) | 779 | static int acm_tty_tiocmget(struct tty_struct *tty) |
780 | { | 780 | { |
781 | struct acm *acm = tty->driver_data; | 781 | struct acm *acm = tty->driver_data; |
782 | 782 | ||
@@ -791,7 +791,7 @@ static int acm_tty_tiocmget(struct tty_struct *tty, struct file *file) | |||
791 | TIOCM_CTS; | 791 | TIOCM_CTS; |
792 | } | 792 | } |
793 | 793 | ||
794 | static int acm_tty_tiocmset(struct tty_struct *tty, struct file *file, | 794 | static int acm_tty_tiocmset(struct tty_struct *tty, |
795 | unsigned int set, unsigned int clear) | 795 | unsigned int set, unsigned int clear) |
796 | { | 796 | { |
797 | struct acm *acm = tty->driver_data; | 797 | struct acm *acm = tty->driver_data; |
@@ -813,7 +813,7 @@ static int acm_tty_tiocmset(struct tty_struct *tty, struct file *file, | |||
813 | return acm_set_control(acm, acm->ctrlout = newctrl); | 813 | return acm_set_control(acm, acm->ctrlout = newctrl); |
814 | } | 814 | } |
815 | 815 | ||
816 | static int acm_tty_ioctl(struct tty_struct *tty, struct file *file, | 816 | static int acm_tty_ioctl(struct tty_struct *tty, |
817 | unsigned int cmd, unsigned long arg) | 817 | unsigned int cmd, unsigned long arg) |
818 | { | 818 | { |
819 | struct acm *acm = tty->driver_data; | 819 | struct acm *acm = tty->driver_data; |