diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-04-09 19:50:02 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-04-09 19:50:02 +0400 |
| commit | 50487c3a4a96d91e25d43d63262773f14961d9de (patch) | |
| tree | 9649437556ec56e5ba27e943313f093318b17b81 /include/linux/usb/usbnet.h | |
| parent | 17c3ad030213da23158082ea90ebbe2a3940a2d2 (diff) | |
| parent | ab5d6fbdb71c183add7431243c7f615c42b643bb (diff) | |
| download | linux-50487c3a4a96d91e25d43d63262773f14961d9de.tar.xz | |
Merge tag 'asoc-v3.15-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.15
A smattering of device specific fixes, nothing stands out here except
for the multiplatform fixes for Samsung and the device IDs being added
by Stephen Warren - there's no real code changes from those and they
give better robustness to the enumeration with DT.
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index e303eef94dd5..0662e98fef72 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -30,7 +30,7 @@ struct usbnet { struct driver_info *driver_info; const char *driver_name; void *driver_priv; - wait_queue_head_t *wait; + wait_queue_head_t wait; struct mutex phy_mutex; unsigned char suspend_count; unsigned char pkt_cnt, pkt_err; |