diff options
| author | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2020-02-11 10:31:22 +0100 |
|---|---|---|
| committer | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2020-02-11 10:31:22 +0100 |
| commit | 2b63eb961ade6c47132d649ec89a48e18754e169 (patch) | |
| tree | b3a8e27cb666b1a65bdb80f8ff51376fdbcefc2f /drivers/platform | |
| parent | f2437e48ac7ae0e99b8e76d88aaf24a9b2e6d3e2 (diff) | |
| parent | 0cbb4f9c69827decf56519c2f63918f16904ede5 (diff) | |
Merge branch 'chrome-platform-5.6-fixes' into for-next
Merge 0cbb4f9c6982 ("platform/chrome: wilco_ec: Include asm/unaligned instead of
linux/ path") from chrome-platform-5.6-fixes into for-next destined branch.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/chrome/wilco_ec/properties.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/chrome/wilco_ec/properties.c b/drivers/platform/chrome/wilco_ec/properties.c index e69682c95ea2..62f27610dd33 100644 --- a/drivers/platform/chrome/wilco_ec/properties.c +++ b/drivers/platform/chrome/wilco_ec/properties.c @@ -5,7 +5,7 @@ #include <linux/platform_data/wilco-ec.h> #include <linux/string.h> -#include <linux/unaligned/le_memmove.h> +#include <asm/unaligned.h> /* Operation code; what the EC should do with the property */ enum ec_property_op { |