diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /drivers/char/tty_ioctl.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/tty_ioctl.c')
| -rw-r--r-- | drivers/char/tty_ioctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index ad6ba4ed2808..8e67d5c642a4 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
| @@ -393,9 +393,7 @@ void tty_termios_encode_baud_rate(struct ktermios *termios, | |||
| 393 | termios->c_cflag |= (BOTHER << IBSHIFT); | 393 | termios->c_cflag |= (BOTHER << IBSHIFT); |
| 394 | #else | 394 | #else |
| 395 | if (ifound == -1 || ofound == -1) { | 395 | if (ifound == -1 || ofound == -1) { |
| 396 | static int warned; | 396 | printk_once(KERN_WARNING "tty: Unable to return correct " |
| 397 | if (!warned++) | ||
| 398 | printk(KERN_WARNING "tty: Unable to return correct " | ||
| 399 | "speed data as your architecture needs updating.\n"); | 397 | "speed data as your architecture needs updating.\n"); |
| 400 | } | 398 | } |
| 401 | #endif | 399 | #endif |