diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/config/Config.in.aufs | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.aufs')
| -rw-r--r-- | target/linux/config/Config.in.aufs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs index 524133061..fe6c60b52 100644 --- a/target/linux/config/Config.in.aufs +++ b/target/linux/config/Config.in.aufs @@ -1,4 +1,4 @@ -config ADK_KPACKAGE_KMOD_AUFS_FS +config ADK_KERNEL_AUFS_FS prompt "Aufs (Advanced multi layered unification filesystem) support" tristate help @@ -10,7 +10,7 @@ config ADK_KPACKAGE_KMOD_AUFS_FS original ideas, approaches and improvements, it becomes totally different from Unionfs while keeping the basic features. -if ADK_KPACKAGE_KMOD_AUFS_FS +if ADK_KERNEL_AUFS_FS choice boolean "Maximum number of branches" @@ -75,7 +75,7 @@ config ADK_KERNEL_AUFS_BR_RAMFS config ADK_KERNEL_AUFS_BR_FUSE bool "Fuse fs as an aufs branch" select ADK_KERNEL_AUFS_POLL - select ADK_KPACKAGE_KMOD_FUSE_FS + select ADK_KERNEL_FUSE_FS help If you want to use fuse-based userspace filesystem as an aufs branch fs, then enable this option. |