Merge branch 'for-4.7/dsm' into libnvdimm-for-next

[cascardo/linux.git] / drivers / acpi / nfit.h

diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h
index f82fda5..46c5014 100644 (file)
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@ -120,6 +120,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;
        int family;
 };