diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
commit | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (patch) | |
tree | ea5dc2d28d15da0de25c197ed7d059c3656af1a0 /coreutils/Config.src | |
parent | 1118c95535ea51961437089fc3dece5ab4ea7e1b (diff) | |
parent | d84b175cb6948eb17f847313bf912174e2f934e1 (diff) | |
download | busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.gz busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.bz2 busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.zip |
Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge
Conflicts:
include/platform.h
Diffstat (limited to 'coreutils/Config.src')
-rw-r--r-- | coreutils/Config.src | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index dcb5add8f..cff2ce216 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
@@ -728,13 +728,6 @@ config FEATURE_WC_LARGE | |||
728 | help | 728 | help |
729 | Use "unsigned long long" in wc for counter variables. | 729 | Use "unsigned long long" in wc for counter variables. |
730 | 730 | ||
731 | config WHO | ||
732 | bool "who" | ||
733 | default y | ||
734 | depends on FEATURE_UTMP | ||
735 | help | ||
736 | who is used to show who is logged on. | ||
737 | |||
738 | config WHOAMI | 731 | config WHOAMI |
739 | bool "whoami" | 732 | bool "whoami" |
740 | default y | 733 | default y |