aboutsummaryrefslogtreecommitdiff
path: root/drivers/pnp/core.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-25 02:13:48 -0400
committerLen Brown <len.brown@intel.com>2010-10-25 02:13:48 -0400
commit8c654bb80801aeafba071396602c777758604980 (patch)
treece8fdf5824637c9d59f8a1cd82a0da98366fa079 /drivers/pnp/core.c
parentb10b977b792bb28c03267e00562c8254dca50f36 (diff)
parentc1f3f2819667a238585c65bba96c8b16af39a442 (diff)
downloadlinux-linaro-stable-8c654bb80801aeafba071396602c777758604980.tar.gz
Merge branch 'pnp-log' into release
Diffstat (limited to 'drivers/pnp/core.c')
-rw-r--r--drivers/pnp/core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index c79ee1ded68d..0f34d962fd3c 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -195,8 +195,9 @@ int pnp_add_device(struct pnp_dev *dev)
for (id = dev->id; id; id = id->next)
len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
- pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
- dev->protocol->name, buf, dev->active ? "active" : "disabled");
+ dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
+ dev->protocol->name, buf,
+ dev->active ? "active" : "disabled");
return 0;
}