From 2d69e5fe0bdb7af6192bcfee2b2a3e4d432d24b7 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 7 Mar 2006 20:57:57 +0000 Subject: [PATCH] [arm] Enable nfs and nfsd modules. svn path=/dists/trunk/linux-2.6/; revision=6095 --- debian/arch/arm/config.footbridge | 15 +++++++++------ debian/arch/arm/config.ixp4xx | 15 ++++++++++----- debian/arch/arm/config.nslu2 | 12 +++++++++--- debian/arch/arm/config.rpc | 18 +++++++++++++----- debian/arch/arm/config.s3c2410 | 14 ++++++++++---- debian/changelog | 1 + 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 0b0550128..192ab5efa 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1353,14 +1353,17 @@ CONFIG_CRAMFS=y # Network File Systems # CONFIG_NFS_FS=y -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m -# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 7af695b25..d02eae80e 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1126,12 +1126,17 @@ CONFIG_JFFS2_RTIME=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index 319a27b72..42ed1ed39 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -1364,11 +1364,17 @@ CONFIG_CRAMFS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index b6c6638fb..67c6968e5 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -844,11 +844,19 @@ CONFIG_ADFS_FS=y # Network File Systems # CONFIG_NFS_FS=y -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set -CONFIG_LOCKD=y +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index d396f7799..eca0eb1af 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -911,11 +911,17 @@ CONFIG_CRAMFS=y # Network File Systems # CONFIG_NFS_FS=m -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set diff --git a/debian/changelog b/debian/changelog index 70f57ff7f..e9b8cf239 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) UNRELEASED; urgency=low - Add Tulip fixes for Cobalt. * Fix a typo in the description of the linux-doc-* package, thanks Justin Pryzby. Closes: #343424. + * [arm] Enable nfs and nfsd modules. -- Bastian Blank Mon, 06 Mar 2006 10:40:01 +0100