diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-11 15:14:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-11 15:14:04 -0400 |
| commit | 01f675029dfdcbd83b451bff4138de0d43752c4a (patch) | |
| tree | 5de2d2da53d138056b2e61b11629ae52d1710289 /drivers/char/hvsi.c | |
| parent | 932088b136c3aeace052cc23179f54022ce3f723 (diff) | |
| parent | d801cec70d69d2d4121e133edd5c3237fe0e0078 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
radeonfb/aty128fb: Disable broken early resume hook for PowerBooks
hvc_console: Remove tty->low_latency on pseries backends
powerpc: fix linkstation and storcenter compilation breakage
powerpc/4xx: Enable SERIAL_OF support by default for Virtex platforms
Diffstat (limited to 'drivers/char/hvsi.c')
| -rw-r--r-- | drivers/char/hvsi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c index 406f8742a260..2989056a9e39 100644 --- a/drivers/char/hvsi.c +++ b/drivers/char/hvsi.c | |||
| @@ -810,7 +810,6 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp) | |||
| 810 | hp = &hvsi_ports[line]; | 810 | hp = &hvsi_ports[line]; |
| 811 | 811 | ||
| 812 | tty->driver_data = hp; | 812 | tty->driver_data = hp; |
| 813 | tty->low_latency = 1; /* avoid throttle/tty_flip_buffer_push race */ | ||
| 814 | 813 | ||
| 815 | mb(); | 814 | mb(); |
| 816 | if (hp->state == HVSI_FSP_DIED) | 815 | if (hp->state == HVSI_FSP_DIED) |