Merge branch 'pnp-log' into release

diff --combined drivers/pnp/core.c
index c79ee1d,53a8f33..0f34d96
--- 1/drivers/pnp/core.c
--- 2/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@@ -124,8 -124,7 +124,8 @@@ static void pnp_release_device(struct d
        kfree(dev);
  }
  
 -struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid)
 +struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,
 +                            const char *pnpid)
  {
        struct pnp_dev *dev;
        struct pnp_id *dev_id;
@@@ -195,8 -194,9 +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;
  }