summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-12-19 09:13:13 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-12-19 11:23:10 +0100
commit197dee7a5979ec299c1ffb1df1a9ceb5cfd7f4f2 (patch)
tree3567d062c74f13fd7030a7fa2e2ceafc7a1b267e
parentab82703aa2ebcd6d6cafac79c88435bab4630406 (diff)
downloadptxdist-197dee7a5979ec299c1ffb1df1a9ceb5cfd7f4f2.tar.gz
ptxdist-197dee7a5979ec299c1ffb1df1a9ceb5cfd7f4f2.tar.xz
timeout: conflict with busybox timeout
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/timeout.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/timeout.in b/rules/timeout.in
index f8327cd7e..76a5d87a4 100644
--- a/rules/timeout.in
+++ b/rules/timeout.in
@@ -3,7 +3,11 @@
config TIMEOUT
tristate
prompt "timeout"
+ depends on !BUSYBOX_TIMEOUT || ALLYES
help
timeout executes a command and imposes an elapsed time
limit. When the time limit is reached, timeout sends a
predefined signal to the target process.
+
+comment "BusyBox' timeout is selected!"
+ depends on BUSYBOX_TIMEOUT