From f673d2ce9bde146ec4e356dd0bb116eaef3f612d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 3 Feb 2006 03:03:58 -0800 Subject: [PATCH] --- yaml --- r: 19627 b: refs/heads/master c: 5423980245c56fd968840b6d36bbddc2719084e4 h: refs/heads/master i: 19625: 2efb56b1ffb0d9a5d0f36bb7551cc825be32da52 19623: f639f4b9b9d4d805feb75cfa942e9a2bc7168095 v: v3 --- [refs] | 2 +- trunk/drivers/char/sx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 91a5efc91d72..5a2625645ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d1d0340da3fc7d1a8d9198e74e97d2db6c3f86f +refs/heads/master: 5423980245c56fd968840b6d36bbddc2719084e4 diff --git a/trunk/drivers/char/sx.c b/trunk/drivers/char/sx.c index 64bf89cb574f..dc4ac9568964 100644 --- a/trunk/drivers/char/sx.c +++ b/trunk/drivers/char/sx.c @@ -931,7 +931,7 @@ static int sx_set_real_termios (void *ptr) case CS6:sx_write_channel_byte (port, hi_mask, 0x3f);break; case CS5:sx_write_channel_byte (port, hi_mask, 0x1f);break; default: - printk (KERN_INFO "sx: Invalid wordsize: %d\n", CFLAG & CSIZE); + printk (KERN_INFO "sx: Invalid wordsize: %lu\n", CFLAG & CSIZE); break; } @@ -958,7 +958,7 @@ static int sx_set_real_termios (void *ptr) } else { set_bit(TTY_HW_COOK_IN, &port->gs.tty->flags); } - sx_dprintk (SX_DEBUG_TERMIOS, "iflags: %x(%d) ", + sx_dprintk (SX_DEBUG_TERMIOS, "iflags: %lx(%d) ", port->gs.tty->termios->c_iflag, I_OTHER(port->gs.tty)); @@ -973,7 +973,7 @@ static int sx_set_real_termios (void *ptr) } else { clear_bit(TTY_HW_COOK_OUT, &port->gs.tty->flags); } - sx_dprintk (SX_DEBUG_TERMIOS, "oflags: %x(%d)\n", + sx_dprintk (SX_DEBUG_TERMIOS, "oflags: %lx(%d)\n", port->gs.tty->termios->c_oflag, O_OTHER(port->gs.tty)); /* port->c_dcd = sx_get_CD (port); */