diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-05-10 21:03:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-05-10 21:03:31 +0200 |
| commit | e038d5515b4a0c0946f331f4eeaa538453a89c36 (patch) | |
| tree | 740f90fae4d41d496de6acbb9c4393bdad5ee882 /drivers/Makefile | |
| parent | 6cde26fda11b3e7bcc17574c6a71e96ac40f2573 (diff) | |
| parent | 14e21cb8f811100a2104e952b8f5bc0326a5e213 (diff) | |
| download | linux-e038d5515b4a0c0946f331f4eeaa538453a89c36.tar.gz linux-e038d5515b4a0c0946f331f4eeaa538453a89c36.tar.bz2 linux-e038d5515b4a0c0946f331f4eeaa538453a89c36.zip | |
Merge branch 'tee/initial-merge' into fixes
This is a dependency for the following fix
* tee/initial-merge:
arm64: dt: hikey: Add optee node
Documentation: tee subsystem and op-tee driver
tee: add OP-TEE driver
tee: generic TEE subsystem
dt/bindings: add bindings for optee
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index edba1edc6654..cfabd141dba2 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -180,3 +180,4 @@ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ +obj-$(CONFIG_TEE) += tee/ |