Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next

[linux-2.6-microblaze.git] / drivers / acpi / nfit / nfit.h

diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h
index 2424194..f5525f8 100644 (file)
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@ -34,6 +34,7 @@
                | ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED)
 
 #define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV
+#define NVDIMM_CMD_MAX 31
 
 #define NVDIMM_STANDARD_CMDMASK \
 (1 << ND_CMD_SMART | 1 << ND_CMD_SMART_THRESHOLD | 1 << ND_CMD_DIMM_FLAGS \
@@ -144,32 +145,32 @@ struct nfit_spa {
        unsigned long ars_state;
        u32 clear_err_unit;
        u32 max_ars;
-       struct acpi_nfit_system_address spa[0];
+       struct acpi_nfit_system_address spa[];
 };
 
 struct nfit_dcr {
        struct list_head list;
-       struct acpi_nfit_control_region dcr[0];
+       struct acpi_nfit_control_region dcr[];
 };
 
 struct nfit_bdw {
        struct list_head list;
-       struct acpi_nfit_data_region bdw[0];
+       struct acpi_nfit_data_region bdw[];
 };
 
 struct nfit_idt {
        struct list_head list;
-       struct acpi_nfit_interleave idt[0];
+       struct acpi_nfit_interleave idt[];
 };
 
 struct nfit_flush {
        struct list_head list;
-       struct acpi_nfit_flush_address flush[0];
+       struct acpi_nfit_flush_address flush[];
 };
 
 struct nfit_memdev {
        struct list_head list;
-       struct acpi_nfit_memory_map memdev[0];
+       struct acpi_nfit_memory_map memdev[];
 };
 
 enum nfit_mem_flags {