wok diff linux/stuff/linux-2.6.34-slitaz.config @ rev 5939

mplayer-svn: fix kernel version
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Aug 02 11:23:10 2010 +0200 (2010-08-02)
parents eefafdc5b65f
children ce1a465271d9
line diff
     1.1 --- a/linux/stuff/linux-2.6.34-slitaz.config	Sun May 30 12:30:37 2010 +0200
     1.2 +++ b/linux/stuff/linux-2.6.34-slitaz.config	Mon Aug 02 11:23:10 2010 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6  # Linux kernel version: 2.6.34
     1.7 -# Fri May 28 14:04:31 2010
     1.8 +# Sat Jun  5 11:33:53 2010
     1.9  #
    1.10  # CONFIG_64BIT is not set
    1.11  CONFIG_X86_32=y
    1.12 @@ -1364,7 +1364,7 @@
    1.13  # CONFIG_PATA_VIA is not set
    1.14  # CONFIG_PATA_WINBOND is not set
    1.15  # CONFIG_PATA_WINBOND_VLB is not set
    1.16 -# CONFIG_PATA_SCH is not set
    1.17 +CONFIG_PATA_SCH=y
    1.18  CONFIG_MD=y
    1.19  CONFIG_BLK_DEV_MD=m
    1.20  CONFIG_MD_LINEAR=m
    1.21 @@ -3039,7 +3039,7 @@
    1.22  # CONFIG_WAVELAN is not set
    1.23  # CONFIG_PCMCIA_WAVELAN is not set
    1.24  CONFIG_PCMCIA_NETWAVE=m
    1.25 -# CONFIG_FB_SM7XX is not set
    1.26 +CONFIG_FB_SM7XX=m
    1.27  # CONFIG_DT3155 is not set
    1.28  CONFIG_CRYSTALHD=m
    1.29  CONFIG_X86_PLATFORM_DEVICES=y
    1.30 @@ -3084,40 +3084,36 @@
    1.31  #
    1.32  # File systems
    1.33  #
    1.34 -CONFIG_EXT2_FS=y
    1.35 -# CONFIG_EXT2_FS_XATTR is not set
    1.36 -# CONFIG_EXT2_FS_XIP is not set
    1.37 -CONFIG_EXT3_FS=y
    1.38 -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
    1.39 -# CONFIG_EXT3_FS_XATTR is not set
    1.40 -CONFIG_EXT4_FS=m
    1.41 +# CONFIG_EXT2_FS is not set
    1.42 +# CONFIG_EXT3_FS is not set
    1.43 +CONFIG_EXT4_FS=y
    1.44 +CONFIG_EXT4_USE_FOR_EXT23=y
    1.45  CONFIG_EXT4_FS_XATTR=y
    1.46  CONFIG_EXT4_FS_POSIX_ACL=y
    1.47  # CONFIG_EXT4_FS_SECURITY is not set
    1.48  # CONFIG_EXT4_DEBUG is not set
    1.49 -CONFIG_JBD=y
    1.50 -CONFIG_JBD2=m
    1.51 -CONFIG_FS_MBCACHE=m
    1.52 +CONFIG_JBD2=y
    1.53 +CONFIG_FS_MBCACHE=y
    1.54  CONFIG_REISERFS_FS=m
    1.55  # CONFIG_REISERFS_CHECK is not set
    1.56  # CONFIG_REISERFS_PROC_INFO is not set
    1.57  # CONFIG_REISERFS_FS_XATTR is not set
    1.58  CONFIG_JFS_FS=m
    1.59 -# CONFIG_JFS_POSIX_ACL is not set
    1.60 +CONFIG_JFS_POSIX_ACL=y
    1.61  # CONFIG_JFS_SECURITY is not set
    1.62  # CONFIG_JFS_DEBUG is not set
    1.63  # CONFIG_JFS_STATISTICS is not set
    1.64  CONFIG_FS_POSIX_ACL=y
    1.65  CONFIG_XFS_FS=y
    1.66  # CONFIG_XFS_QUOTA is not set
    1.67 -# CONFIG_XFS_POSIX_ACL is not set
    1.68 +CONFIG_XFS_POSIX_ACL=y
    1.69  # CONFIG_XFS_RT is not set
    1.70  # CONFIG_XFS_DEBUG is not set
    1.71  CONFIG_GFS2_FS=m
    1.72  # CONFIG_GFS2_FS_LOCKING_DLM is not set
    1.73  # CONFIG_OCFS2_FS is not set
    1.74  CONFIG_BTRFS_FS=m
    1.75 -# CONFIG_BTRFS_FS_POSIX_ACL is not set
    1.76 +CONFIG_BTRFS_FS_POSIX_ACL=y
    1.77  # CONFIG_NILFS2_FS is not set
    1.78  CONFIG_FILE_LOCKING=y
    1.79  CONFIG_FSNOTIFY=y
    1.80 @@ -3514,7 +3510,7 @@
    1.81  CONFIG_GENERIC_FIND_NEXT_BIT=y
    1.82  CONFIG_GENERIC_FIND_LAST_BIT=y
    1.83  CONFIG_CRC_CCITT=y
    1.84 -CONFIG_CRC16=m
    1.85 +CONFIG_CRC16=y
    1.86  # CONFIG_CRC_T10DIF is not set
    1.87  CONFIG_CRC_ITU_T=m
    1.88  CONFIG_CRC32=y