diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/char/mxser.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/char/mxser.c')
| -rw-r--r-- | drivers/char/mxser.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 645d9d713aec..72cfd09091e0 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -996,7 +996,6 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) | |||
| 996 | 996 | ||
| 997 | info->session = current->signal->session; | 997 | info->session = current->signal->session; |
| 998 | info->pgrp = process_group(current); | 998 | info->pgrp = process_group(current); |
| 999 | clear_bit(TTY_DONT_FLIP, &tty->flags); | ||
| 1000 | 999 | ||
| 1001 | /* | 1000 | /* |
| 1002 | status = mxser_get_msr(info->base, 0, info->port); | 1001 | status = mxser_get_msr(info->base, 0, info->port); |