Merge branch 'pnp' into release

diff --combined drivers/pnp/core.c
index 0f34d96,9801918..cb6ce42
--- 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,9 -194,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;
  }
  
@@@ -220,10 -218,5 +220,5 @@@ subsys_initcall(pnp_init)
  int pnp_debug;
  
  #if defined(CONFIG_PNP_DEBUG_MESSAGES)
- static int __init pnp_debug_setup(char *__unused)
- {
-       pnp_debug = 1;
-       return 1;
- }
- __setup("pnp.debug", pnp_debug_setup);
+ module_param_named(debug, pnp_debug, int, 0644);
  #endif