diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 09:56:12 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 09:56:12 +0200 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/smc91x.h | |
parent | [netdrvr] b44: handle excessive multicast groups (diff) | |
parent | ACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff) | |
download | linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r-- | drivers/net/smc91x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index fedd1a37bc3e..636dbfcdf8cb 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -507,7 +507,7 @@ smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma, #endif static void -smc_pxa_dma_irq(int dma, void *dummy, struct pt_regs *regs) +smc_pxa_dma_irq(int dma, void *dummy) { DCSR(dma) = 0; } |