Merge branch 'pnp' into release

This commit is contained in:
Len Brown
2011-01-12 04:59:44 -05:00
5 changed files with 13 additions and 14 deletions

View File

@ -220,10 +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