projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
staging
/
Makefile
diff --git
a/drivers/staging/Makefile
b/drivers/staging/Makefile
index
ddc3c4a
..
a2b53b9
100644
(file)
--- a/
drivers/staging/Makefile
+++ b/
drivers/staging/Makefile
@@
-65,3
+65,5
@@
obj-$(CONFIG_XILLYBUS) += xillybus/
obj-$(CONFIG_DGNC) += dgnc/
obj-$(CONFIG_DGAP) += dgap/
obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f_spinand/
+obj-$(CONFIG_LTTNG) += lttng/
+obj-$(CONFIG_KTAP) += ktap/