summaryrefslogtreecommitdiffstats
path: root/samples/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-21 10:07:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-21 10:07:07 +0100
commitfdcee305c08a27c8d5d2d03eb5b2656ac3e4a0cc (patch)
tree69e990b2538a4104e1f6b5e1358532bb68e210b5 /samples/Makefile
parentMerge tag 'fpga-for-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentcoresight: core: Fix typo in a comment (diff)
downloadlinux-fdcee305c08a27c8d5d2d03eb5b2656ac3e4a0cc.tar.xz
linux-fdcee305c08a27c8d5d2d03eb5b2656ac3e4a0cc.zip
Merge tag 'coresight-next-v5.17' of gitolite.kernel.org:pub/scm/linux/kernel/git/coresight/linux into char-misc-next
Mathieu writes: Coresight changes for v5.17 This pull request includes: - A patch that uses devm_bitmap_zalloc() instead of the open-coded equivalent. - Work to make coresight complex configuration loadable via modules. - Some coresight documentation updates. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> * tag 'coresight-next-v5.17' of gitolite.kernel.org:pub/scm/linux/kernel/git/coresight/linux: coresight: core: Fix typo in a comment Documentation: coresight: Update coresight configuration docs coresight: configfs: Allow configfs to activate configuration coresight: syscfg: Example CoreSight configuration loadable module coresight: syscfg: Update load API for config loadable modules coresight: configuration: Update API to permit dynamic load/unload coresight: configuration: Update API to introduce load owner concept Documentation: coresight: Fix documentation issue coresight: Use devm_bitmap_zalloc when applicable
Diffstat (limited to 'samples/Makefile')
-rw-r--r--samples/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/Makefile b/samples/Makefile
index 4bcd6b93bffa..1ae4de99c983 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -32,3 +32,4 @@ obj-$(CONFIG_SAMPLE_INTEL_MEI) += mei/
subdir-$(CONFIG_SAMPLE_WATCHDOG) += watchdog
subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak/
+obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG) += coresight/