diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/8390.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/8390.h')
| -rw-r--r-- | drivers/net/8390.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8390.h b/drivers/net/8390.h index ca4eb0ccf8cf..f44f1220b3a5 100644 --- a/drivers/net/8390.h +++ b/drivers/net/8390.h | |||
| @@ -35,7 +35,7 @@ extern void ei_poll(struct net_device *dev); | |||
| 35 | extern void NS8390_init(struct net_device *dev, int startp); | 35 | extern void NS8390_init(struct net_device *dev, int startp); |
| 36 | extern int ei_open(struct net_device *dev); | 36 | extern int ei_open(struct net_device *dev); |
| 37 | extern int ei_close(struct net_device *dev); | 37 | extern int ei_close(struct net_device *dev); |
| 38 | extern irqreturn_t ei_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 38 | extern irqreturn_t ei_interrupt(int irq, void *dev_id); |
| 39 | extern struct net_device *__alloc_ei_netdev(int size); | 39 | extern struct net_device *__alloc_ei_netdev(int size); |
| 40 | static inline struct net_device *alloc_ei_netdev(void) | 40 | static inline struct net_device *alloc_ei_netdev(void) |
| 41 | { | 41 | { |