summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Król <piotr.krol@3mdeb.com>2014-09-05 00:58:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-04 16:25:30 -0700
commit6fa9e1be7f28dd407d710c3ab367b1e5bc34c2bf (patch)
tree25001acaa787d921d5680c7e0b2f815dbce365ba
parent8b0da75c04d630e69f334bc09fe4f6765b4d7ebf (diff)
usb: usbip: fix usbip.h path in userspace tool
Fixes: 588b48caf65c ("usbip: move usbip userspace code out of staging") which introduced build failure by not changing uapi/usbip.h include path according to new location. Signed-off-by: Piotr Król <piotr.krol@3mdeb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/uapi/linux/Kbuild1
-rw-r--r--tools/usb/usbip/libsrc/usbip_common.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 24e9033f8b3f..9955c3b0ef93 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -395,6 +395,7 @@ header-y += un.h
header-y += unistd.h
header-y += unix_diag.h
header-y += usbdevice_fs.h
+header-y += usbip.h
header-y += utime.h
header-y += utsname.h
header-y += uuid.h
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 @@
#include <syslog.h>
#include <unistd.h>
#include <linux/usb/ch9.h>
-#include "../../uapi/usbip.h"
+#include <linux/usbip.h>
#ifndef USBIDS_FILE
#define USBIDS_FILE "/usr/share/hwdata/usb.ids"