diff options
| author | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-06-14 23:43:00 +0200 |
|---|---|---|
| committer | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-06-20 11:53:52 +0200 |
| commit | 4116fd25c5262e90427f9840e861a8553374a867 (patch) | |
| tree | bf04895317794726e5f58a46ee690f86df64d8e5 /drivers/platform/chrome/Makefile | |
| parent | Input: cros_ec_keyb: mask out extra flags in event_type (diff) | |
| download | linux-4116fd25c5262e90427f9840e861a8553374a867.tar.xz linux-4116fd25c5262e90427f9840e861a8553374a867.zip | |
platform/chrome: cros_ec_lpc: Merge cros_ec_lpc and cros_ec_lpc_reg
The cros_ec_lpc_reg files are only used by the cros_ec_lpc core and
there isn't logical separation between them. So, merge those files into
the cros_ec_lpc also allowing us to drop the header file used for the
interface between the two.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Nick Crews <ncrews@chromium.org>
Diffstat (limited to 'drivers/platform/chrome/Makefile')
| -rw-r--r-- | drivers/platform/chrome/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile index c5583c48d1e5..5a2bcef4b07c 100644 --- a/drivers/platform/chrome/Makefile +++ b/drivers/platform/chrome/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_CROS_EC_ISHTP) += cros_ec_ishtp.o obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o -cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_reg.o +cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpcs-$(CONFIG_CROS_EC_LPC_MEC) += cros_ec_lpc_mec.o obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o cros_ec_trace.o |