X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Ftokenring%2Ftms380tr.c;h=9d121890b6fba87dc11c5802d0f690f458d9e0d4;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=afd1dc2a6158e46b5ae088860abf256c3d031e4d;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index afd1dc2a6..9d121890b 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c @@ -252,6 +252,7 @@ int tms380tr_open(struct net_device *dev) /* Reset the hardware here. Don't forget to set the station address. */ +#ifdef CONFIG_ISA if(dev->dma > 0) { unsigned long flags=claim_dma_lock(); @@ -260,6 +261,7 @@ int tms380tr_open(struct net_device *dev) enable_dma(dev->dma); release_dma_lock(flags); } +#endif err = tms380tr_chipset_init(dev); if(err) @@ -1149,12 +1151,14 @@ int tms380tr_close(struct net_device *dev) del_timer(&tp->timer); tms380tr_disable_interrupts(dev); +#ifdef CONFIG_ISA if(dev->dma > 0) { unsigned long flags=claim_dma_lock(); disable_dma(dev->dma); release_dma_lock(flags); } +#endif SIFWRITEW(0xFF00, SIFCMD); #if 0