summaryrefslogtreecommitdiff
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-27 14:05:02 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-27 14:05:02 -0700
commit365aa51e11cc537ac39a96f765ad8e7511aa93ff (patch)
treef47c7455d06be57bb63835f53bed6c2df1bed0a7 /drivers/staging/Makefile
parent9908b4f32f91aafa86239dd092e9e5540e8615e0 (diff)
staging: ktap: remove code from tree
ktap should be merged through the "proper" place in the kernel tree, in the perf tool, not as a stand-alone kernel module in staging. So remove it from here for now so that it can be merged correctly later. Reported-by: Ingo Molnar <mingo@kernel.org> Cc: Jovi Zhangwei <jovi.zhangwei@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2270ed077bde..b0d3303b4680 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -67,4 +67,3 @@ obj-$(CONFIG_XILLYBUS) += xillybus/
obj-$(CONFIG_DGNC) += dgnc/
obj-$(CONFIG_DGAP) += dgap/
obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f_spinand/
-obj-$(CONFIG_KTAP) += ktap/