Commit db1df5cb authored by Jeff Garzik's avatar Jeff Garzik

Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
parents 14fc589b 8e73fb03
...@@ -770,7 +770,7 @@ static inline void ace_unmask_irq(struct net_device *dev) ...@@ -770,7 +770,7 @@ static inline void ace_unmask_irq(struct net_device *dev)
if (ACE_IS_TIGON_I(ap)) if (ACE_IS_TIGON_I(ap))
writel(0, &regs->MaskInt); writel(0, &regs->MaskInt);
else else
writel(readl(&regs->HostCtrl) &= ~MASK_INTS, &regs->HostCtrl); writel(readl(&regs->HostCtrl) & ~MASK_INTS, &regs->HostCtrl);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment