diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-24 12:42:53 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-24 12:42:53 -0800 |
| commit | f15c219bae7edbc29422956535bb00c35f34b5c1 (patch) | |
| tree | 5af158f4941eb5fd99f5dbd793a800689c0e090c /config-generic | |
| parent | 160f417d95a261d4472bcf7dcf5e47f139c0432d (diff) | |
| parent | 258c0838a1f71d15e569ab302030f4837be9cb19 (diff) | |
| download | kernel-f15c219bae7edbc29422956535bb00c35f34b5c1.tar.gz kernel-f15c219bae7edbc29422956535bb00c35f34b5c1.tar.xz kernel-f15c219bae7edbc29422956535bb00c35f34b5c1.zip | |
Merge branch 'master' into baytrail
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 498d28b0c..109be03d6 100644 --- a/config-generic +++ b/config-generic @@ -4189,7 +4189,7 @@ CONFIG_9P_FSCACHE=y CONFIG_9P_FS_POSIX_ACL=y CONFIG_9P_FS_SECURITY=y CONFIG_FUSE_FS=m -CONFIG_OVERLAYFS_FS=m +CONFIG_OVERLAY_FS=m # CONFIG_OMFS_FS is not set CONFIG_CUSE=m # CONFIG_F2FS_FS is not set |