diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 14:34:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 14:34:07 -0400 |
| commit | 9d93551188069a0a21e664b4bfc89ed4a6df1903 (patch) | |
| tree | bcf7334c0e57323a6844b8147ce1c92180fe8cef /tools | |
| parent | dd4cae8bf16611053ee7b00e20aa4fa945b92b99 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.
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" |