From f1f49572d0ed38a30ae8cc4bd2995da6d300ca8e Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 21 Feb 2006 10:44:19 +0000 Subject: [PATCH] debian/arch: Unify xfs settings. svn path=/dists/trunk/linux-2.6/; revision=5946 --- debian/arch/alpha/config | 1 - debian/arch/amd64/config | 1 - debian/arch/arm/config.footbridge | 1 - debian/arch/arm/config.ixp4xx | 1 - debian/arch/arm/config.nslu2 | 1 - debian/arch/arm/config.rpc | 1 - debian/arch/arm/config.s3c2410 | 4 ---- debian/arch/armeb/config.nslu2 | 1 - debian/arch/config | 2 ++ debian/arch/hppa/config | 5 ----- debian/arch/i386/config | 1 - debian/arch/ia64/config | 2 -- debian/arch/m68k/config | 5 ----- debian/arch/powerpc/config | 2 -- debian/arch/s390/config | 2 -- debian/arch/sparc/config | 2 -- debian/arch/sparc/config.sparc32 | 6 ------ 17 files changed, 2 insertions(+), 36 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index c30383150..139ac4e3b 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -1582,7 +1582,6 @@ CONFIG_EXT2_FS=y CONFIG_JBD=m CONFIG_FS_MBCACHE=y CONFIG_XFS_RT=y -CONFIG_XFS_SECURITY=y # CONFIG_TMPFS_XATTR is not set CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index c64a2a03b..0ac62b2b8 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -1426,7 +1426,6 @@ CONFIG_INFINIBAND_IPOIB=m CONFIG_EDD=m CONFIG_JBD=m CONFIG_XFS_RT=y -CONFIG_XFS_SECURITY=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y # CONFIG_HUGETLBFS is not set diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index f92c2d8d4..ca6412f75 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1314,7 +1314,6 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index a50f740c7..bde80b77f 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1161,7 +1161,6 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index afbf73c7e..882b98228 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -1384,7 +1384,6 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 551599f88..f11ebc163 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -810,7 +810,6 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index 20049a0f1..e5a6784e5 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -864,10 +864,6 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -# CONFIG_XFS_SECURITY is not set -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index e4ebf7e7d..7481866c9 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -1384,7 +1384,6 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y diff --git a/debian/arch/config b/debian/arch/config index e3360e7d6..5189a6cc2 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -827,3 +827,5 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS=m CONFIG_EXT3_FS=m CONFIG_EXT3_FS_SECURITY=y +# CONFIG_XFS_RT is not set +CONFIG_XFS_SECURITY=y diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index a7bbdd481..9ed6cf8d7 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -855,11 +855,6 @@ CONFIG_EXT2_FS=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_XFS_FS=m -CONFIG_XFS_EXPORT=y -# CONFIG_XFS_RT is not set -# CONFIG_XFS_SECURITY is not set -# CONFIG_XFS_POSIX_ACL is not set CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_XATTR is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 52bd0a927..a3c02d340 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1674,7 +1674,6 @@ CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_JBD=m CONFIG_XFS_RT=y -CONFIG_XFS_SECURITY=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y # CONFIG_HUGETLBFS is not set diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index c52bf7e0a..2701bd8ea 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -1242,8 +1242,6 @@ CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_JBD=m CONFIG_FS_MBCACHE=m -# CONFIG_XFS_RT is not set -CONFIG_XFS_SECURITY=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y # CONFIG_HUGETLBFS is not set diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 257a5c927..bd5dd4bf3 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -271,11 +271,6 @@ CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_XFS_FS=m -CONFIG_XFS_EXPORT=y -# CONFIG_XFS_RT is not set -# CONFIG_XFS_SECURITY is not set -# CONFIG_XFS_POSIX_ACL is not set CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_XATTR is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 9e5036118..fff80f8d0 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -1143,8 +1143,6 @@ CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_JBD=m CONFIG_FS_MBCACHE=m -# CONFIG_XFS_RT is not set -CONFIG_XFS_SECURITY=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 217574795..6af4c5051 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -120,8 +120,6 @@ CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_JBD=y CONFIG_FS_MBCACHE=y -# CONFIG_XFS_RT is not set -# CONFIG_XFS_SECURITY is not set # CONFIG_TMPFS_XATTR is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index ae00782c2..d70d1171b 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -308,8 +308,6 @@ CONFIG_SERIO_LIBPS2=y CONFIG_EXT2_FS=y CONFIG_JBD=m CONFIG_FS_MBCACHE=y -# CONFIG_XFS_RT is not set -# CONFIG_XFS_SECURITY is not set CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y # CONFIG_ADFS_FS is not set diff --git a/debian/arch/sparc/config.sparc32 b/debian/arch/sparc/config.sparc32 index cf8a7a568..f359f4e65 100644 --- a/debian/arch/sparc/config.sparc32 +++ b/debian/arch/sparc/config.sparc32 @@ -1086,12 +1086,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y # CONFIG_REISERFS_FS_SECURITY is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -CONFIG_XFS_EXPORT=y -CONFIG_XFS_QUOTA=y -# CONFIG_XFS_SECURITY is not set -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=m CONFIG_ROMFS_FS=m