diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/gianfar.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index c35d47c40c39..9e81a50cf2be 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -754,7 +754,7 @@ static inline void gfar_write(volatile unsigned __iomem *addr, u32 val) | |||
| 754 | out_be32(addr, val); | 754 | out_be32(addr, val); |
| 755 | } | 755 | } |
| 756 | 756 | ||
| 757 | extern irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs); | 757 | extern irqreturn_t gfar_receive(int irq, void *dev_id); |
| 758 | extern int startup_gfar(struct net_device *dev); | 758 | extern int startup_gfar(struct net_device *dev); |
| 759 | extern void stop_gfar(struct net_device *dev); | 759 | extern void stop_gfar(struct net_device *dev); |
| 760 | extern void gfar_halt(struct net_device *dev); | 760 | extern void gfar_halt(struct net_device *dev); |