diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-01-08 12:05:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 07:14:06 +0300 |
| commit | d1c4ac408fbab78a5f89ff583b68d2d11b421bb3 (patch) | |
| tree | 857d824bbb6ee2dc92acbf44e1df5f829645a56f /drivers | |
| parent | a771f2b82aa266fe578468deed82f797e26a3dc4 (diff) | |
| download | linux-d1c4ac408fbab78a5f89ff583b68d2d11b421bb3.tar.xz | |
[PATCH] parport_pc: arm build fix
free_dma() isn't implemented on ARM unless HAS_DMA is set.
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parport/parport_pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 18e85ccdae67..9302b8fd7461 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c @@ -2371,8 +2371,10 @@ void parport_pc_unregister_port (struct parport *p) spin_lock(&ports_lock); list_del_init(&priv->list); spin_unlock(&ports_lock); +#if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA) if (p->dma != PARPORT_DMA_NONE) free_dma(p->dma); +#endif if (p->irq != PARPORT_IRQ_NONE) free_irq(p->irq, p); release_region(p->base, 3); @@ -2380,14 +2382,12 @@ void parport_pc_unregister_port (struct parport *p) release_region(p->base + 3, p->size - 3); if (p->modes & PARPORT_MODE_ECP) release_region(p->base_hi, 3); -#ifdef CONFIG_PARPORT_PC_FIFO -#ifdef HAS_DMA +#if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA) if (priv->dma_buf) pci_free_consistent(priv->dev, PAGE_SIZE, priv->dma_buf, priv->dma_handle); #endif -#endif kfree (p->private_data); parport_put_port(p); kfree (ops); /* hope no-one cached it */ |