diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 15:57:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 15:57:31 -0700 |
| commit | 665ab0f3c8b8f86bb77b25285ac93870c7054d63 (patch) | |
| tree | c7d12c3559982eb3fb1847438d4b45ce034851e5 /drivers/isdn | |
| parent | bf03f65b7967df5807ddef7b99f8a41d4c94fc70 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| download | kernel_goldelico_gta04-665ab0f3c8b8f86bb77b25285ac93870c7054d63.zip kernel_goldelico_gta04-665ab0f3c8b8f86bb77b25285ac93870c7054d63.tar.gz kernel_goldelico_gta04-665ab0f3c8b8f86bb77b25285ac93870c7054d63.tar.bz2 | |
Merge 3.4-rc3 into tty-next
This allows us to pick up some changes needed for other serial patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/gigaset/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index b3d6ac1..a6d9fd2 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c @@ -176,7 +176,7 @@ static void if_close(struct tty_struct *tty, struct file *filp) struct cardstate *cs = tty->driver_data; if (!cs) { /* happens if we didn't find cs in open */ - printk(KERN_DEBUG "%s: no cardstate\n", __func__); + gig_dbg(DEBUG_IF, "%s: no cardstate", __func__); return; } |