From: Len Brown <len.brown@intel.com>
Date: Sun, 29 May 2011 08:40:39 +0000 (-0400)
Subject: Merge branch 'ec-cleanup' into release
X-Git-Tag: firefly_0821_release~7613^2~1002^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=751516f0a9bad32544f40f471037c0e45fb639c9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'ec-cleanup' into release

Conflicts:
	drivers/platform/x86/compal-laptop.c
---

751516f0a9bad32544f40f471037c0e45fb639c9
diff --cc drivers/platform/x86/compal-laptop.c
index c16a27641ced,f4f43e65475f..9b3afb6f0b13
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@@ -200,8 -200,8 +200,8 @@@ static bool extra_features
   * watching the output of address 0x4F (do an ec_transaction writing 0x33
   * into 0x4F and read a few bytes from the output, like so:
   *	u8 writeData = 0x33;
-  *	ec_transaction(0x4F, &writeData, 1, buffer, 32, 0);
-  * That address is labelled "fan1 table information" in the service manual.
+  *	ec_transaction(0x4F, &writeData, 1, buffer, 32);
 - * That address is labled "fan1 table information" in the service manual.
++ * That address is labeled "fan1 table information" in the service manual.
   * It should be clear which value in 'buffer' changes). This seems to be
   * related to fan speed. It isn't a proper 'realtime' fan speed value
   * though, because physically stopping or speeding up the fan doesn't