diff options
Diffstat (limited to 'drivers/acpi/nfit.c')
| -rw-r--r-- | drivers/acpi/nfit.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index c1b8d03e262e..bc18aa213bb1 100644 --- a/drivers/acpi/nfit.c +++ b/drivers/acpi/nfit.c @@ -706,7 +706,7 @@ static ssize_t flags_show(struct device *dev,  		flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save_fail " : "",  		flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore_fail " : "",  		flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush_fail " : "", -		flags & ACPI_NFIT_MEM_ARMED ? "not_armed " : "", +		flags & ACPI_NFIT_MEM_NOT_ARMED ? "not_armed " : "",  		flags & ACPI_NFIT_MEM_HEALTH_OBSERVED ? "smart_event " : "");  }  static DEVICE_ATTR_RO(flags); @@ -815,7 +815,7 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)  			flags |= NDD_ALIASING;  		mem_flags = __to_nfit_memdev(nfit_mem)->flags; -		if (mem_flags & ACPI_NFIT_MEM_ARMED) +		if (mem_flags & ACPI_NFIT_MEM_NOT_ARMED)  			flags |= NDD_UNARMED;  		rc = acpi_nfit_add_dimm(acpi_desc, nfit_mem, device_handle); @@ -839,7 +839,7 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)  		  mem_flags & ACPI_NFIT_MEM_SAVE_FAILED ? " save_fail" : "",  		  mem_flags & ACPI_NFIT_MEM_RESTORE_FAILED ? " restore_fail":"",  		  mem_flags & ACPI_NFIT_MEM_FLUSH_FAILED ? " flush_fail" : "", -		  mem_flags & ACPI_NFIT_MEM_ARMED ? " not_armed" : ""); +		  mem_flags & ACPI_NFIT_MEM_NOT_ARMED ? " not_armed" : "");  	} | 
