diff options
| author | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-09-02 19:02:02 +0200 |
|---|---|---|
| committer | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-09-02 19:02:02 +0200 |
| commit | 7e0bb52d0df9bbe4aa82847c243644848d914872 (patch) | |
| tree | 54e7f42c819ae378d809e01b9e5af261204985bb /drivers/platform/chrome/cros_ec_ishtp.c | |
| parent | 058bf149b92a735b2b17a3797938fa455f9ed189 (diff) | |
| parent | 28e6fcc871bcff640c8960448034ea3a7c7fdfa3 (diff) | |
Merge tag 'ib-mfd-extcon-hid-i2c-iio-input-media-chrome-power-pwm-rtc-sound-v5.4' into chrome-platform/for-next
Immutable branch between MFD, Extcon, HID, I2C, IIO, Input, Chrome, Power,
PWM, RTC and Sound to allow picking patches that depends on the series
that moves some code from the MFD subsystem to platform/chrome.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Diffstat (limited to 'drivers/platform/chrome/cros_ec_ishtp.c')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_ishtp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c index e504d255d5ce..7d050db5b1ca 100644 --- a/drivers/platform/chrome/cros_ec_ishtp.c +++ b/drivers/platform/chrome/cros_ec_ishtp.c @@ -8,11 +8,10 @@ // (ISH-TP). #include <linux/delay.h> -#include <linux/mfd/core.h> -#include <linux/mfd/cros_ec.h> -#include <linux/mfd/cros_ec_commands.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/platform_data/cros_ec_commands.h> +#include <linux/platform_data/cros_ec_proto.h> #include <linux/intel-ish-client-if.h> /* |