diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
| commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
| tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /arch/um/drivers/stdio_console.c | |
| parent | 86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff) | |
| parent | fd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/um/drivers/stdio_console.c')
| -rw-r--r-- | arch/um/drivers/stdio_console.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 827777af3f6d..7b361f36ca96 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
| @@ -110,7 +110,6 @@ static const struct tty_operations console_ops = { | |||
| 110 | .set_termios = line_set_termios, | 110 | .set_termios = line_set_termios, |
| 111 | .throttle = line_throttle, | 111 | .throttle = line_throttle, |
| 112 | .unthrottle = line_unthrottle, | 112 | .unthrottle = line_unthrottle, |
| 113 | .cleanup = line_cleanup, | ||
| 114 | .hangup = line_hangup, | 113 | .hangup = line_hangup, |
| 115 | }; | 114 | }; |
| 116 | 115 | ||