diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/pnp/resource.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/pnp/resource.c')
| -rw-r--r-- | drivers/pnp/resource.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 887ad8939349..6ded527169f4 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
| @@ -477,12 +477,14 @@ int pnp_check_dma(struct pnp_dev * dev, int idx) | |||
| 477 | } | 477 | } |
| 478 | 478 | ||
| 479 | 479 | ||
| 480 | #if 0 | ||
| 480 | EXPORT_SYMBOL(pnp_register_dependent_option); | 481 | EXPORT_SYMBOL(pnp_register_dependent_option); |
| 481 | EXPORT_SYMBOL(pnp_register_independent_option); | 482 | EXPORT_SYMBOL(pnp_register_independent_option); |
| 482 | EXPORT_SYMBOL(pnp_register_irq_resource); | 483 | EXPORT_SYMBOL(pnp_register_irq_resource); |
| 483 | EXPORT_SYMBOL(pnp_register_dma_resource); | 484 | EXPORT_SYMBOL(pnp_register_dma_resource); |
| 484 | EXPORT_SYMBOL(pnp_register_port_resource); | 485 | EXPORT_SYMBOL(pnp_register_port_resource); |
| 485 | EXPORT_SYMBOL(pnp_register_mem_resource); | 486 | EXPORT_SYMBOL(pnp_register_mem_resource); |
| 487 | #endif /* 0 */ | ||
| 486 | 488 | ||
| 487 | 489 | ||
| 488 | /* format is: pnp_reserve_irq=irq1[,irq2] .... */ | 490 | /* format is: pnp_reserve_irq=irq1[,irq2] .... */ |