diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-01 15:13:07 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-01 15:13:07 -0300 |
commit | 11dd742b39ac10b320183f78d2cf81e4680f9a4e (patch) | |
tree | d6150b2fd3f3127e1aa88e173e17a4f1ad205f75 /libre/kernel26-libre-lts/config | |
parent | 1365d8aac05d2f167d0a1678cc291bbec3efff5c (diff) | |
parent | c40a217db5f63be3aa88a32ad77ec93efb40d95c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mhwaveedit/PKGBUILD
extra/apr/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/unarchiver/PKGBUILD
Diffstat (limited to 'libre/kernel26-libre-lts/config')
-rw-r--r-- | libre/kernel26-libre-lts/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config index fa7600cfb..fcf978f36 100644 --- a/libre/kernel26-libre-lts/config +++ b/libre/kernel26-libre-lts/config @@ -4366,11 +4366,11 @@ CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y -# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set |