linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/platform/x86/eeepc-laptop.c between commit
471452104b8520337ae2fb48c4e61cd4896e025d ("const: constify remaining
dev_pm_ops") from Linus' tree and commit
52bbe3c7b413d656833686f9f08e5dcab3786eeb ("eeepc-laptop: code movement")
from the acpi tree.

The latter just moved the code that the former was updating.  I fixed it
up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/platform/x86/eeepc-laptop.c
index e647a85,d07a4c0..0000000
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@@ -866,16 -862,37 +862,37 @@@ static int eeepc_hotk_restore(struct de
  	return 0;
  }
  
 -static struct dev_pm_ops eeepc_pm_ops = {
++static const struct dev_pm_ops eeepc_pm_ops = {
+ 	.thaw = eeepc_hotk_thaw,
+ 	.restore = eeepc_hotk_restore,
+ };
+ 
+ static struct platform_driver platform_driver = {
+ 	.driver = {
+ 		.name = EEEPC_LAPTOP_FILE,
+ 		.owner = THIS_MODULE,
+ 		.pm = &eeepc_pm_ops,
+ 	}
+ };
+ 
  /*
-  * Hwmon
+  * Hwmon device
   */
+ 
+ #define EEEPC_EC_SC00      0x61
+ #define EEEPC_EC_FAN_PWM   (EEEPC_EC_SC00 + 2) /* Fan PWM duty cycle (%) */
+ #define EEEPC_EC_FAN_HRPM  (EEEPC_EC_SC00 + 5) /* High byte, fan speed (RPM) */
+ #define EEEPC_EC_FAN_LRPM  (EEEPC_EC_SC00 + 6) /* Low byte, fan speed (RPM) */
+ 
+ #define EEEPC_EC_SFB0      0xD0
+ #define EEEPC_EC_FAN_CTRL  (EEEPC_EC_SFB0 + 3) /* Byte containing SF25  */
+ 
  static int eeepc_get_fan_pwm(void)
  {
- 	int value = 0;
+ 	u8 value = 0;
  
- 	read_acpi_int(NULL, EEEPC_EC_FAN_PWM, &value);
- 	value = value * 255 / 100;
- 	return (value);
+ 	ec_read(EEEPC_EC_FAN_PWM, &value);
+ 	return value * 255 / 100;
  }
  
  static void eeepc_set_fan_pwm(int value)

Attachment: pgp00000.pgp
Description: PGP signature