diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
| commit | 7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch) | |
| tree | d93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /package/busybox | |
| parent | 1021766976319b40e64ca8dee12d21c758197801 (diff) | |
| parent | e6803b9f91357773154daed13d6e83712d49476c (diff) | |
| download | buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.gz buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/busybox.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 7af7ecaf22..20b8c1d87b 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -575,7 +575,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y CONFIG_FEATURE_GPT_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y # CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set +CONFIG_FLOCK=y CONFIG_FREERAMDISK=y # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set |
