diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-06 08:01:11 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-06 08:01:11 -0400 |
| commit | 8df22a4d6f5b81c9c1703579d4907b57002689ed (patch) | |
| tree | 064e9662d427a82076e1151fcd9aa78a1066f9f4 /tools | |
| parent | 0cae90a96c15f2fd3bd139ba5505755c9c9ef2eb (diff) | |
| parent | a5448c88b812390a3622e76d774e10c0da1fb970 (diff) | |
Merge tag 'asoc-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.18
- More componentisation work from Lars-Peter, this time mainly
cleaning up the suspend and bias level transition callbacks.
- Real system support for the Intel drivers and a bunch of fixes and
enhancements for the associated CODEC drivers, this is going to need
a lot quirks over time due to the lack of any firmware description of
the boards.
- Jack detect support for simple card from Dylan Reid.
- A bunch of small fixes and enhancements for the Freescale drivers.
- New drivers for Analog Devices SSM4567, Cirrus Logic CS35L32, Everest
Semiconductor ES8328 and Freescale cards using the ASRC in newer i.MX
processors.
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" |