Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / drivers / net / cs89x0.c

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 5890a917a628b2155ff88e6ad44ed130a166b5fc..a28de8182802c68698f86f966acb20a2032d74c4 100644 (file)
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -1405,9 +1405,7 @@ net_open(struct net_device *dev)
 release_dma:
 #if ALLOW_DMA
                free_dma(dev->dma);
-#endif
 release_irq:
-#if ALLOW_DMA
                release_dma_buff(lp);
 #endif
                 writereg(dev, PP_LineCTL, readreg(dev, PP_LineCTL) & ~(SERIAL_TX_ON | SERIAL_RX_ON));