diff options
author | Mark Salyzyn <salyzyn@google.com> | 2021-01-14 06:52:15 -0800 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2021-01-14 06:52:15 -0800 |
commit | c47869b05f9c3403dbdc7bf3b6bba954a3904b56 (patch) | |
tree | 8de12a6bd2142df8b655596471398130f4825459 /drivers/edgetpu/Makefile | |
parent | 81a0949d37fd3f3bb4cd3d2e61b76b3ff45612e1 (diff) | |
parent | e0d2f4a867dba26c3cade6e25f2b1b61700c0978 (diff) | |
download | edgetpu-c47869b05f9c3403dbdc7bf3b6bba954a3904b56.tar.gz |
Merge partner/android-gs-pixel-mainline into partner/android-gs-pixel-5.10-stabilization
* partner/android-gs-pixel-mainline:
Merge branch 'whitechapel' into android-gs-pixel-mainline
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: Ic0a2f56d63195c6edc1e222969847e48d0745208
Diffstat (limited to 'drivers/edgetpu/Makefile')
-rw-r--r-- | drivers/edgetpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edgetpu/Makefile b/drivers/edgetpu/Makefile index b85b8fc..0391dcf 100644 --- a/drivers/edgetpu/Makefile +++ b/drivers/edgetpu/Makefile @@ -16,7 +16,7 @@ endif edgetpu-fw-objs := edgetpu-firmware-util.o edgetpu-shared-fw.o edgetpu-firmware.o edgetpu-objs := edgetpu-core.o edgetpu-mailbox.o edgetpu-kci.o edgetpu-device-group.o edgetpu-telemetry.o edgetpu-mapping.o edgetpu-dmabuf.o edgetpu-async.o edgetpu-iremap-pool.o edgetpu-sw-watchdog.o $(edgetpu-fw-objs) -abrolhos-objs := abrolhos-device.o abrolhos-firmware.o edgetpu-fs.o abrolhos-platform.o abrolhos-iommu.o abrolhos-thermal.o abrolhos-pm.o abrolhos-debug-dump.o $(edgetpu-objs) +abrolhos-objs := abrolhos-device.o abrolhos-firmware.o edgetpu-fs.o abrolhos-platform.o abrolhos-iommu.o abrolhos-thermal.o abrolhos-pm.o abrolhos-debug-dump.o abrolhos-usage-stats.o $(edgetpu-objs) KBUILD_OPTIONS += CONFIG_ABROLHOS=m |