diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-04-26 17:04:41 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-04-26 17:04:41 +0200 |
commit | b6237f61fc9ca79b8771a4fa412d2c630c9f8d2b (patch) | |
tree | 5a83f6f90292c16b3386f67d35d6948537d26dc8 /drivers/acpi/numa/hmat.c | |
parent | aad659e490eff3b8e11fca292e6ae4c75e86e871 (diff) | |
parent | 6ee4bdc27d1aee6fb4dde9b28c95fe87d87c1438 (diff) | |
download | linux-b6237f61fc9ca79b8771a4fa412d2c630c9f8d2b.tar.gz linux-b6237f61fc9ca79b8771a4fa412d2c630c9f8d2b.tar.bz2 linux-b6237f61fc9ca79b8771a4fa412d2c630c9f8d2b.zip |
Merge branch 'acpi-misc'
* acpi-misc:
ACPI: dock: fix some coding style issues
ACPI: sysfs: fix some coding style issues
ACPI: PM: add a missed blank line after declarations
ACPI: custom_method: fix a coding style issue
ACPI: CPPC: fix some coding style issues
ACPI: button: fix some coding style issues
ACPI: battery: fix some coding style issues
ACPI: acpi_pad: add a missed blank line after declarations
ACPI: LPSS: add a missed blank line after declarations
ACPI: ipmi: remove useless return statement for void function
ACPI: processor: fix some coding style issues
ACPI: APD: fix a block comment align issue
ACPI: AC: fix some coding style issues
ACPI: fix various typos in comments
Diffstat (limited to 'drivers/acpi/numa/hmat.c')
-rw-r--r-- | drivers/acpi/numa/hmat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index cb73a5d6ea76..a84d85d8333c 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -722,7 +722,7 @@ static void hmat_register_target(struct memory_target *target) /* * Skip offline nodes. This can happen when memory * marked EFI_MEMORY_SP, "specific purpose", is applied - * to all the memory in a promixity domain leading to + * to all the memory in a proximity domain leading to * the node being marked offline / unplugged, or if * memory-only "hotplug" node is offline. */ |