diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-16 10:53:59 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-16 10:53:59 -0400 |
| commit | 4cd41ffd27b6b775445ecfdb72b592b71d6b4a32 (patch) | |
| tree | 61e8c51ed5b9fae163d2d54967ebda02805c0bfa /tools/usb | |
| parent | d9152161b4bfd131a8253a5b9fcd8ba9b10277c4 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into next
Linux 3.17-rc5
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'tools/usb')
| -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" |