diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:59:44 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:59:44 -0500 |
| commit | 6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (patch) | |
| tree | 5b0ddc0eb897435f9fade4c4b5927f777ca23707 /drivers/pnp/core.c | |
| parent | 633379a0f9f16362835d7a3fde141d3a95fd6c97 (diff) | |
| parent | cdefba03e44bd3b3311a3849a81ec7030dfa1519 (diff) | |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/core.c')
| -rw-r--r-- | drivers/pnp/core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index 0f34d962fd3c..cb6ce42f8e77 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c | |||
| @@ -220,10 +220,5 @@ subsys_initcall(pnp_init); | |||
| 220 | int pnp_debug; | 220 | int pnp_debug; |
| 221 | 221 | ||
| 222 | #if defined(CONFIG_PNP_DEBUG_MESSAGES) | 222 | #if defined(CONFIG_PNP_DEBUG_MESSAGES) |
| 223 | static int __init pnp_debug_setup(char *__unused) | 223 | module_param_named(debug, pnp_debug, int, 0644); |
| 224 | { | ||
| 225 | pnp_debug = 1; | ||
| 226 | return 1; | ||
| 227 | } | ||
| 228 | __setup("pnp.debug", pnp_debug_setup); | ||
| 229 | #endif | 224 | #endif |