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/irda/mcs7780.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/irda/mcs7780.h')
| -rw-r--r-- | drivers/net/irda/mcs7780.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/mcs7780.h b/drivers/net/irda/mcs7780.h index 1a723d725c2a..b18148cee638 100644 --- a/drivers/net/irda/mcs7780.h +++ b/drivers/net/irda/mcs7780.h | |||
| @@ -156,8 +156,8 @@ static int mcs_net_close(struct net_device *netdev); | |||
| 156 | static int mcs_net_open(struct net_device *netdev); | 156 | static int mcs_net_open(struct net_device *netdev); |
| 157 | static struct net_device_stats *mcs_net_get_stats(struct net_device *netdev); | 157 | static struct net_device_stats *mcs_net_get_stats(struct net_device *netdev); |
| 158 | 158 | ||
| 159 | static void mcs_receive_irq(struct urb *urb, struct pt_regs *regs); | 159 | static void mcs_receive_irq(struct urb *urb); |
| 160 | static void mcs_send_irq(struct urb *urb, struct pt_regs *regs); | 160 | static void mcs_send_irq(struct urb *urb); |
| 161 | static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *netdev); | 161 | static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *netdev); |
| 162 | 162 | ||
| 163 | static int mcs_probe(struct usb_interface *intf, | 163 | static int mcs_probe(struct usb_interface *intf, |