diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:05:44 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:05:44 -0700 |
| commit | 0606263f24f3d64960de742c55894190b5df903b (patch) | |
| tree | 673894f227c1a761f601ad7bdc1ceef003bb85cb /include/uapi/linux | |
| parent | a72255983f12f31f0c8d8275fb1a781546cfacb7 (diff) | |
| parent | d4c5725d57323e2348940fcc6416072671a9b432 (diff) | |
| download | linux-stable-0606263f24f3d64960de742c55894190b5df903b.tar.gz linux-stable-0606263f24f3d64960de742c55894190b5df903b.tar.bz2 linux-stable-0606263f24f3d64960de742c55894190b5df903b.zip | |
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/ndctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h index 309915f74492..ba5a8c79652a 100644 --- a/include/uapi/linux/ndctl.h +++ b/include/uapi/linux/ndctl.h @@ -298,6 +298,7 @@ struct nd_cmd_pkg { #define NVDIMM_FAMILY_INTEL 0 #define NVDIMM_FAMILY_HPE1 1 #define NVDIMM_FAMILY_HPE2 2 +#define NVDIMM_FAMILY_MSFT 3 #define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\ struct nd_cmd_pkg) |