diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
commit | bdea534db894ea19320f470ce2e63b1d9de96a15 (patch) | |
tree | 8ec2a0a93d9bb5e7205253c67aa624b9ec227477 /include/uapi/linux | |
parent | 39b5a56ec0be5effe9b7d0f18cb27724bf2e5d47 (diff) | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
download | op-kernel-dev-bdea534db894ea19320f470ce2e63b1d9de96a15.zip op-kernel-dev-bdea534db894ea19320f470ce2e63b1d9de96a15.tar.gz |
Merge tag 'v3.17-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/usbip.h | 26 | ||||
-rw-r--r-- | include/uapi/linux/xattr.h | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/include/uapi/linux/usbip.h b/include/uapi/linux/usbip.h new file mode 100644 index 0000000..fa5db30 --- /dev/null +++ b/include/uapi/linux/usbip.h @@ -0,0 +1,26 @@ +/* + * usbip.h + * + * USBIP uapi defines and function prototypes etc. +*/ + +#ifndef _UAPI_LINUX_USBIP_H +#define _UAPI_LINUX_USBIP_H + +/* usbip device status - exported in usbip device sysfs status */ +enum usbip_device_status { + /* sdev is available. */ + SDEV_ST_AVAILABLE = 0x01, + /* sdev is now used. */ + SDEV_ST_USED, + /* sdev is unusable because of a fatal error. */ + SDEV_ST_ERROR, + + /* vdev does not connect a remote device. */ + VDEV_ST_NULL, + /* vdev is used, but the USB address is not assigned yet */ + VDEV_ST_NOTASSIGNED, + VDEV_ST_USED, + VDEV_ST_ERROR +}; +#endif /* _UAPI_LINUX_USBIP_H */ diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h index c38355c..1590c49 100644 --- a/include/uapi/linux/xattr.h +++ b/include/uapi/linux/xattr.h @@ -13,7 +13,7 @@ #ifndef _UAPI_LINUX_XATTR_H #define _UAPI_LINUX_XATTR_H -#ifdef __UAPI_DEF_XATTR +#if __UAPI_DEF_XATTR #define __USE_KERNEL_XATTR_DEFS #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ |