diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /include/linux/usb/usbnet.h | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 7d3822243074..36fabb95c7d3 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -176,6 +176,11 @@ struct skb_data { /* skb->cb is one of these */ | |||
| 176 | size_t length; | 176 | size_t length; |
| 177 | }; | 177 | }; |
| 178 | 178 | ||
| 179 | extern int usbnet_open (struct net_device *net); | ||
| 180 | extern int usbnet_stop (struct net_device *net); | ||
| 181 | extern int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net); | ||
| 182 | extern void usbnet_tx_timeout (struct net_device *net); | ||
| 183 | extern int usbnet_change_mtu (struct net_device *net, int new_mtu); | ||
| 179 | 184 | ||
| 180 | extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *); | 185 | extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *); |
| 181 | extern void usbnet_defer_kevent (struct usbnet *, int); | 186 | extern void usbnet_defer_kevent (struct usbnet *, int); |