diff options
| author | Benson Leung <bleung@chromium.org> | 2018-10-09 21:29:51 -0700 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2018-10-09 21:29:51 -0700 |
| commit | 2c42dd6e0e3b0f5949924c8251a9d34ab373d2e0 (patch) | |
| tree | 887d0c00b499e6870d3dd5974f1784d00f723037 /drivers/platform/chrome/cros_ec_lpc_mec.c | |
| parent | d4d2313a3c17eff4aef9a544023c2df5b9f5bedc (diff) | |
| parent | e2bbf91cad09118d7500f1fdaaa83d7741d30395 (diff) | |
Merge remote-tracking branch 'origin/ib-chrome-platform-mfd-move-cros_ec_lpc' into working-branch-for-4.20
Diffstat (limited to 'drivers/platform/chrome/cros_ec_lpc_mec.c')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_lpc_mec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/chrome/cros_ec_lpc_mec.c b/drivers/platform/chrome/cros_ec_lpc_mec.c index 2eda2c2fc210..c4edfa83e493 100644 --- a/drivers/platform/chrome/cros_ec_lpc_mec.c +++ b/drivers/platform/chrome/cros_ec_lpc_mec.c @@ -24,10 +24,11 @@ #include <linux/delay.h> #include <linux/io.h> #include <linux/mfd/cros_ec_commands.h> -#include <linux/mfd/cros_ec_lpc_mec.h> #include <linux/mutex.h> #include <linux/types.h> +#include "cros_ec_lpc_mec.h" + /* * This mutex must be held while accessing the EMI unit. We can't rely on the * EC mutex because memmap data may be accessed without it being held. |