diff options
author | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
commit | 4327974639c4d7f8688f564081956f8f79ef053c (patch) | |
tree | 0ca57c56b2f76a39f476e8f22b0112aa566b3a86 /drivers/staging/usbip | |
parent | c3e5127312f97482a6a09c0df602c726675eff5b (diff) | |
parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Diffstat (limited to 'drivers/staging/usbip')
-rw-r--r-- | drivers/staging/usbip/usbip_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h index 074ac4267d3..be216175ae8 100644 --- a/drivers/staging/usbip/usbip_common.h +++ b/drivers/staging/usbip/usbip_common.h @@ -126,12 +126,12 @@ extern struct device_attribute dev_attr_usbip_debug; * */ #define USBIP_CMD_SUBMIT 0x0001 -#define USBIP_RET_SUBMIT 0x0002 -#define USBIP_CMD_UNLINK 0x0003 +#define USBIP_CMD_UNLINK 0x0002 +#define USBIP_RET_SUBMIT 0x0003 #define USBIP_RET_UNLINK 0x0004 -#define USBIP_DIR_IN 0x00 -#define USBIP_DIR_OUT 0x01 +#define USBIP_DIR_OUT 0x00 +#define USBIP_DIR_IN 0x01 /** * struct usbip_header_basic - data pertinent to every request |