diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-04-03 06:27:29 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-04-03 06:27:29 -0400 |
| commit | 0ed2aef9b3bffe598045b62a31a50d912eee92d8 (patch) | |
| tree | d7dda12955c838f531727d2775d09c4e04bdf066 /arch/um/drivers/stdio_console.c | |
| parent | cfea7d7e452f57682a0bb55a55e9f79c569558c2 (diff) | |
| parent | 8011657b9e63cb2e914b9a0f75233b910c1854cb (diff) | |
Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/core
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 | ||