diff options
author | 2012-03-19 17:02:01 -0700 | |
---|---|---|
committer | 2012-03-19 17:02:01 -0700 | |
commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
tree | ea409366a5208aced495bc0516a08b81fd43222e /net/9p/util.c | |
parent | Input: wacom - fix physical size calculation for 3rd-gen Bamboo (diff) | |
parent | Input: ili210x - add support for Ilitek ILI210x based touchscreens (diff) | |
download | linux-dev-10ce3cc919f50c2043b41ca968b43c26a3672600.tar.xz linux-dev-10ce3cc919f50c2043b41ca968b43c26a3672600.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/9p/util.c')
-rw-r--r-- | net/9p/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/util.c b/net/9p/util.c index 9c1c9348ac35..6ceeeb384de7 100644 --- a/net/9p/util.c +++ b/net/9p/util.c @@ -106,7 +106,7 @@ retry: else if (error) return -1; - P9_DPRINTK(P9_DEBUG_MUX, " id %d pool %p\n", i, p); + p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", i, p); return i; } EXPORT_SYMBOL(p9_idpool_get); @@ -124,7 +124,7 @@ void p9_idpool_put(int id, struct p9_idpool *p) { unsigned long flags; - P9_DPRINTK(P9_DEBUG_MUX, " id %d pool %p\n", id, p); + p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", id, p); spin_lock_irqsave(&p->lock, flags); idr_remove(&p->pool, id); |