diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:06:48 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:06:48 -0700 |
| commit | 2159669f581917c4d197d3ea183d3d85b47faf66 (patch) | |
| tree | 9faa8bbf19fa1ea33e371b02cfa5a5b4507583de /drivers/acpi/nfit.h | |
| parent | 594d6d96ea042366878aa7dc7f5711b8c245db5a (diff) | |
| parent | 9dec4892ca9afd6aad3c9c9e6c17480ecbd04440 (diff) | |
Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/nfit.h')
| -rw-r--r-- | drivers/acpi/nfit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h index c75576b2d50e..5201840c1147 100644 --- a/drivers/acpi/nfit.h +++ b/drivers/acpi/nfit.h @@ -109,6 +109,7 @@ struct nfit_mem { struct nfit_flush *nfit_flush; struct list_head list; struct acpi_device *adev; + struct acpi_nfit_desc *acpi_desc; unsigned long dsm_mask; }; |