Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / platform / x86 / thinkpad_acpi.c

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 3dad27a385d3b27e90c80a229927db11b47cc9e5..d99f1cd435a281009f05839a8265a513890b63bd 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -5811,7 +5811,7 @@ static struct ibm_struct volume_driver_data = {
  *     ThinkPads from this same time period (and earlier) probably lack the
  *     tachometer as well.
  *
- *     Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare
+ *     Unfortunately a lot of ThinkPads with new-style ECs but whose firmware
  *     was never fixed by IBM to report the EC firmware version string
  *     probably support the tachometer (like the early X models), so
  *     detecting it is quite hard.  We need more data to know for sure.