Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96135
b: refs/heads/master
c: 3168cb9
h: refs/heads/master
i:
  96133: 21d9270
  96131: bb12e24
  96127: be75440
v: v3
  • Loading branch information
WANG Cong authored and Linus Torvalds committed May 8, 2008
1 parent 09a68c5 commit 357a0ca
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb6969e8cdef39e613b1755eff595f830b89bc82
refs/heads/master: 3168cb98be7199325de633052680098660ccaf84
4 changes: 2 additions & 2 deletions trunk/arch/um/drivers/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ void line_flush_chars(struct tty_struct *tty)
line_flush_buffer(tty);
}

void line_put_char(struct tty_struct *tty, unsigned char ch)
int line_put_char(struct tty_struct *tty, unsigned char ch)
{
line_write(tty, &ch, sizeof(ch));
return line_write(tty, &ch, sizeof(ch));
}

int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/um/include/line.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ extern int line_setup(struct line *lines, unsigned int sizeof_lines,
char *init, char **error_out);
extern int line_write(struct tty_struct *tty, const unsigned char *buf,
int len);
extern void line_put_char(struct tty_struct *tty, unsigned char ch);
extern int line_put_char(struct tty_struct *tty, unsigned char ch);
extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
extern int line_chars_in_buffer(struct tty_struct *tty);
extern void line_flush_buffer(struct tty_struct *tty);
Expand Down

0 comments on commit 357a0ca

Please sign in to comment.