diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-19 16:31:14 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-19 16:31:14 -0400 |
| commit | 20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58 (patch) | |
| tree | 528c2f113e428e060e185ccab7eab8d8e87c7d36 /include/linux/usb/usbnet.h | |
| parent | d14df339c72b6efbba4eddd1d1f3f4b173273f74 (diff) | |
| parent | 40f8989695660dee984338861ca9900b8e0b5183 (diff) | |
Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A number of small, fairly unexciting, fixes for drivers - nothing stand
out.
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 9cb2fe8ca944..e303eef94dd5 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -42,6 +42,7 @@ struct usbnet { | |||
| 42 | struct usb_host_endpoint *status; | 42 | struct usb_host_endpoint *status; |
| 43 | unsigned maxpacket; | 43 | unsigned maxpacket; |
| 44 | struct timer_list delay; | 44 | struct timer_list delay; |
| 45 | const char *padding_pkt; | ||
| 45 | 46 | ||
| 46 | /* protocol/interface state */ | 47 | /* protocol/interface state */ |
| 47 | struct net_device *net; | 48 | struct net_device *net; |