2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index b8241561da45..a665951b1586 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -34,7 +34,7 @@ config PARPORT
 
 config PARPORT_PC
         tristate "PC-style hardware"
-        depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R
+        depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
         ---help---
           You should say Y here if you have a PC-style parallel port. All
           IBM PC compatible computers and some Alphas have PC-style
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 */