diff options
author | Ron Yorston <rmy@pobox.com> | 2020-08-23 10:59:38 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2020-08-23 10:59:38 +0100 |
commit | 5dbbfe22dd28c3b3ecd5763cc8e60406136e87ce (patch) | |
tree | 64c983708f9f2a21a2fbec14a06d85057d886dfd /procps/ps.c | |
parent | 64ecd10486934c12336dac84c67a1939dce0e096 (diff) | |
parent | a949399d178f7b052ada2099c62621736eafce44 (diff) | |
download | busybox-w32-5dbbfe22dd28c3b3ecd5763cc8e60406136e87ce.tar.gz busybox-w32-5dbbfe22dd28c3b3ecd5763cc8e60406136e87ce.tar.bz2 busybox-w32-5dbbfe22dd28c3b3ecd5763cc8e60406136e87ce.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
-rw-r--r-- | procps/ps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/procps/ps.c b/procps/ps.c index 22905ddff..a4de11379 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -33,7 +33,6 @@ | |||
33 | //config: | 33 | //config: |
34 | //config:config FEATURE_PS_TIME | 34 | //config:config FEATURE_PS_TIME |
35 | //config: bool "Enable -o time and -o etime specifiers" | 35 | //config: bool "Enable -o time and -o etime specifiers" |
36 | //config: select PLATFORM_LINUX # statfs() | ||
37 | //config: default y | 36 | //config: default y |
38 | //config: depends on (PS || MINIPS) && DESKTOP | 37 | //config: depends on (PS || MINIPS) && DESKTOP |
39 | //config: | 38 | //config: |