diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:11:20 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:11:20 -0300 |
| commit | 793441a3a6a0b684d5582b89cd20e2ad938c4af1 (patch) | |
| tree | e6af325b03aec391a34041af6b7a8a1bbbe59a6a /libre/linux-libre/config.x86_64 | |
| parent | 4a327be44c87e40815c2080d6cfa47df975fa856 (diff) | |
| parent | b8b2a77044e32c47576a821c0db0fb00038e647a (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
Diffstat (limited to 'libre/linux-libre/config.x86_64')
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 5f8c3d003..427eee5e3 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.0 Kernel Configuration +# Linux/x86_64 3.2.6-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4988,17 +4988,10 @@ CONFIG_SIGMA=m # # File systems # -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y |