projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'imx-soc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
[cascardo/linux.git]
/
include
/
uapi
/
linux
/
btrfs.h
diff --git
a/include/uapi/linux/btrfs.h
b/include/uapi/linux/btrfs.h
index
23c6960
..
2bdd1e3
100644
(file)
--- a/
include/uapi/linux/btrfs.h
+++ b/
include/uapi/linux/btrfs.h
@@
-118,7
+118,7
@@
struct btrfs_ioctl_vol_args_v2 {
};
union {
char name[BTRFS_SUBVOL_NAME_MAX + 1];
- u64 devid;
+
__
u64 devid;
};
};