diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-16 10:40:38 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-16 10:40:38 -0400 |
| commit | 779608521976e3b8d264f89c67e64c918949cc9b (patch) | |
| tree | 12d604aa1a08b5bf556be11ee9c08b5b6b000179 /tools | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
| parent | f7667af21736eb231e3589d9f91183d325cabfbe (diff) | |
Merge tag 'asoc-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
This is mostly driver fixes, the biggest one being the tlv320aic31xx
which is relatively large but simple and device specific. There's a
small fix in the error handling in DPCM too which is relatively minor
error handling fix.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/usb/usbip/libsrc/usbip_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/usb/usbip/libsrc/usbip_common.h b/tools/usb/usbip/libsrc/usbip_common.h index 5a0e95edf4df..15fe792e1e96 100644 --- a/tools/usb/usbip/libsrc/usbip_common.h +++ b/tools/usb/usbip/libsrc/usbip_common.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <syslog.h> | 15 | #include <syslog.h> |
| 16 | #include <unistd.h> | 16 | #include <unistd.h> |
| 17 | #include <linux/usb/ch9.h> | 17 | #include <linux/usb/ch9.h> |
| 18 | #include "../../uapi/usbip.h" | 18 | #include <linux/usbip.h> |
| 19 | 19 | ||
| 20 | #ifndef USBIDS_FILE | 20 | #ifndef USBIDS_FILE |
| 21 | #define USBIDS_FILE "/usr/share/hwdata/usb.ids" | 21 | #define USBIDS_FILE "/usr/share/hwdata/usb.ids" |