History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 12 years ago

Commit eb84d6b2 parents 97a13e5 d030671694 files · +6360 −3445Browse files

Showing the changes to include/uapi (3 of 694 files). Show all

Unified · Split

3 files
  1. include/uapi/drm/radeon_drm.h +1 −0
  2. include/uapi/linux/usbip.h +26 −0
  3. include/uapi/linux/xattr.h +1 −1
include/uapi/drm/radeon_drm.h+1−0
@@ -944,6 +944,7 @@ struct drm_radeon_cs_chunk { · 943 unmodified lines
944944 };
945945
946946 /* drm_radeon_cs_reloc.flags */
947+#define RADEON_RELOC_PRIO_MASK (0xf << 0)
947948
948949 struct drm_radeon_cs_reloc {
949950 uint32_t handle;
include/uapi/linux/usbip.h+26−0
@@ -0,0 +1,26 @@
1+/*
2+ * usbip.h
3+ *
4+ * USBIP uapi defines and function prototypes etc.
5+*/
6+
7+#ifndef _UAPI_LINUX_USBIP_H
8+#define _UAPI_LINUX_USBIP_H
9+
10+/* usbip device status - exported in usbip device sysfs status */
11+enum usbip_device_status {
12+ /* sdev is available. */
13+ SDEV_ST_AVAILABLE = 0x01,
14+ /* sdev is now used. */
15+ SDEV_ST_USED,
16+ /* sdev is unusable because of a fatal error. */
17+ SDEV_ST_ERROR,
18+
19+ /* vdev does not connect a remote device. */
20+ VDEV_ST_NULL,
21+ /* vdev is used, but the USB address is not assigned yet */
22+ VDEV_ST_NOTASSIGNED,
23+ VDEV_ST_USED,
24+ VDEV_ST_ERROR
25+};
26+#endif /* _UAPI_LINUX_USBIP_H */
include/uapi/linux/xattr.h+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #ifndef _UAPI_LINUX_XATTR_H
1414 #define _UAPI_LINUX_XATTR_H
1515
16−#ifdef __UAPI_DEF_XATTR
16+#if __UAPI_DEF_XATTR
1717 #define __USE_KERNEL_XATTR_DEFS
1818
1919 #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t