git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
drivers
/
Makefile
diff --git
a/drivers/Makefile
b/drivers/Makefile
index edba1edc66549c4b80c5cfde88f4cf8633d3e743..cfabd141dba2ad3a6208f3c880f5cc7a14eecc3e 100644
(file)
--- 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/