diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/platform/olpc/Makefile | |
parent | 6bd744b723d229ac38eeea2cf0717d8cd2858032 (diff) | |
parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
download | linux-stable-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.gz linux-stable-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.bz2 linux-stable-4aa31b4b61e4985e719352c329c3948d1932cb64.zip |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/platform/olpc/Makefile')
-rw-r--r-- | drivers/platform/olpc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/olpc/Makefile b/drivers/platform/olpc/Makefile index cee085c6532d..e9b67000cbcb 100644 --- a/drivers/platform/olpc/Makefile +++ b/drivers/platform/olpc/Makefile @@ -2,4 +2,5 @@ # # OLPC XO platform-specific drivers # -obj-$(CONFIG_OLPC) += olpc-ec.o +obj-$(CONFIG_OLPC_EC) += olpc-ec.o +obj-$(CONFIG_OLPC_XO175_EC) += olpc-xo175-ec.o |