diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 16:16:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 16:16:28 +0200 |
| commit | 414d06ace9cca3725b6c2072e1951e1e03807f63 (patch) | |
| tree | 31e3c2c3da9260d5541e3d8de7045aabcbf66033 /drivers/Makefile | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
| parent | 14e21cb8f811100a2104e952b8f5bc0326a5e213 (diff) | |
| download | op-kernel-dev-414d06ace9cca3725b6c2072e1951e1e03807f63.zip op-kernel-dev-414d06ace9cca3725b6c2072e1951e1e03807f63.tar.gz | |
Merge tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into next/tee
Pull "generic TEE subsystem for v4.12"
Introduce generic TEE subsystem:
- the TEE subsystem itself
- an OP-TEE driver using the subsystem
- optee bindings
- optee node for hi6220-hikey.dts
* tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
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 2eced9a..5db9aa6 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -177,3 +177,4 @@ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ +obj-$(CONFIG_TEE) += tee/ |
