From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Feb 2020 07:17:41 +0000 (+0000)
Subject: Merge tag 'tag-chrome-platform-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=79703e014ba02ad86af4bcdf0c16e4b208cca406;p=linux.git

Merge tag 'tag-chrome-platform-for-v5.6' of git://git./linux/kernel/git/chrome-platform/linux

Pull chrome platform updates from Benson Leung:
 "CrOS EC:

   - Refactoring of some of cros_ec's headers:

     include/linux/mfd/cros_ec.h now removed, new cros_ec.h added to
     drivers/platform/chrome which contains shared operations of cros_ec
     transport drivers.

   - Response tracing in cros_ec_proto

  Wilco EC:

   - Fix unregistration order.

   - Fix keyboard backlight probing on systems without keyboard
     backlight

   - Minor cleanup (newlines in printks, COMPILE_TEST)

  Misc:

   - chromeos_laptop converted to use i2c_new_scanned_device instead of
     i2c_new_probed_device"

* tag 'tag-chrome-platform-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_ec: Match implementation with headers
  platform/chrome: cros_ec: Drop unaligned.h include
  platform/chrome: wilco_ec: Allow wilco to be compiled in COMPILE_TEST
  platform/chrome: wilco_ec: Add newlines to printks
  platform/chrome: wilco_ec: Fix unregistration order
  cros_ec: treewide: Remove 'include/linux/mfd/cros_ec.h'
  platform/chrome: cros_ec_ishtp: Make init_lock static
  platform/chrome: chromeos_laptop: Convert to i2c_new_scanned_device
  platform/chrome: cros_ec_lpc: Use platform_get_irq_optional() for optional IRQs
  platform/chrome: cros_ec_proto: Add response tracing
  platform/chrome: cros_ec_trace: Match trace commands with EC commands
---

79703e014ba02ad86af4bcdf0c16e4b208cca406
diff --cc drivers/mfd/cros_ec_dev.c
index d0c28a4c10ad0,8da4e4cef26fd..39e6116950536
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@@ -5,9 -5,7 +5,8 @@@
   * Copyright (C) 2014 Google, Inc.
   */
  
 +#include <linux/kconfig.h>
  #include <linux/mfd/core.h>
- #include <linux/mfd/cros_ec.h>
  #include <linux/module.h>
  #include <linux/mod_devicetable.h>
  #include <linux/of_platform.h>