diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/pnp/manager.c | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/pnp/manager.c')
-rw-r--r-- | drivers/pnp/manager.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index cbb2749db17..261668618b2 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c | |||
@@ -555,7 +555,9 @@ void pnp_resource_change(struct resource *resource, unsigned long start, unsigne | |||
555 | 555 | ||
556 | 556 | ||
557 | EXPORT_SYMBOL(pnp_manual_config_dev); | 557 | EXPORT_SYMBOL(pnp_manual_config_dev); |
558 | #if 0 | ||
558 | EXPORT_SYMBOL(pnp_auto_config_dev); | 559 | EXPORT_SYMBOL(pnp_auto_config_dev); |
560 | #endif | ||
559 | EXPORT_SYMBOL(pnp_activate_dev); | 561 | EXPORT_SYMBOL(pnp_activate_dev); |
560 | EXPORT_SYMBOL(pnp_disable_dev); | 562 | EXPORT_SYMBOL(pnp_disable_dev); |
561 | EXPORT_SYMBOL(pnp_resource_change); | 563 | EXPORT_SYMBOL(pnp_resource_change); |