diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
| commit | 811c449748d5bd0505f8510e5582892f94ac0cda (patch) | |
| tree | 2640249cb2a9605c7cd59467b9861b205e9bcc8a /coreutils/Config.src | |
| parent | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (diff) | |
| parent | 19311bfa7b8e8c6effa9c375de9b0eb4338bee12 (diff) | |
| download | busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.gz busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.bz2 busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.zip | |
Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge
Conflicts:
coreutils/ls.c
shell/ash.c
Diffstat (limited to 'coreutils/Config.src')
| -rw-r--r-- | coreutils/Config.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index 6297f43a3..2769aa07d 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
| @@ -594,7 +594,7 @@ config FEATURE_SPLIT_FANCY | |||
| 594 | config STAT | 594 | config STAT |
| 595 | bool "stat" | 595 | bool "stat" |
| 596 | default y | 596 | default y |
| 597 | depends on PLATFORM_LINUX # statfs() | 597 | select PLATFORM_LINUX # statfs() |
| 598 | help | 598 | help |
| 599 | display file or filesystem status. | 599 | display file or filesystem status. |
| 600 | 600 | ||