diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-03-06 02:10:51 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-03-06 02:10:51 +0300 |
| commit | 05ef1c50e7c2f796460737a7a7c2d315dd166544 (patch) | |
| tree | 2d6423856824019b445478ecab0fbc59d70a6ed5 /include/uapi/linux | |
| parent | 97c31606075b30d0c5d70e477f54bb3f222e048d (diff) | |
| parent | a528aca7f359f4b0b1d72ae406097e491a5ba9ea (diff) | |
| download | linux-05ef1c50e7c2f796460737a7a7c2d315dd166544.tar.xz | |
Merge branch 'for-linus' into work.lookups
for the sake of namei.c fixes
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 41e0433b4a83..149bec83a907 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -222,7 +222,6 @@ struct fsxattr { #define BLKSECDISCARD _IO(0x12,125) #define BLKROTATIONAL _IO(0x12,126) #define BLKZEROOUT _IO(0x12,127) -#define BLKDAXSET _IO(0x12,128) #define BLKDAXGET _IO(0x12,129) #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ |