diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /drivers/net/wan/pc300_tty.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/net/wan/pc300_tty.c')
| -rw-r--r-- | drivers/net/wan/pc300_tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c index 4293889e287e..515d9b8af01e 100644 --- a/drivers/net/wan/pc300_tty.c +++ b/drivers/net/wan/pc300_tty.c | |||
| @@ -540,7 +540,7 @@ static int cpc_tty_chars_in_buffer(struct tty_struct *tty) | |||
| 540 | return -ENODEV; | 540 | return -ENODEV; |
| 541 | } | 541 | } |
| 542 | 542 | ||
| 543 | return(0); | 543 | return 0; |
| 544 | } | 544 | } |
| 545 | 545 | ||
| 546 | static int pc300_tiocmset(struct tty_struct *tty, struct file *file, | 546 | static int pc300_tiocmset(struct tty_struct *tty, struct file *file, |