[kernel] r6273 - in dists/sid/linux-2.6/debian: . arch/arm arch/armeb

[Martin Michlmayr]

Author: tbm
Date: Fri Mar 24 01:26:43 2006
New Revision: 6273

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.nslu2
   dists/sid/linux-2.6/debian/arch/armeb/config.nslu2
   dists/sid/linux-2.6/debian/changelog
Log:
[arm/armeb] Enable CONFIG_NFSD on NSLU2 again.



Modified: dists/sid/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.nslu2	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.nslu2	Fri Mar 24 01:26:43 2006
@@ -1369,14 +1369,24 @@
 #
 # Network File Systems
 #
+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_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_SUNRPC=m
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_CIFS is not set

Modified: dists/sid/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/sid/linux-2.6/debian/arch/armeb/config.nslu2	(original)
+++ dists/sid/linux-2.6/debian/arch/armeb/config.nslu2	Fri Mar 24 01:26:43 2006
@@ -142,7 +142,7 @@
 # Processor Features
 #
 # CONFIG_ARM_THUMB is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_XSCALE_PMU=y
 CONFIG_DMABOUNCE=y
 
@@ -1369,14 +1369,24 @@
 #
 # Network File Systems
 #
+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_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_SUNRPC=m
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_CIFS is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Mar 24 01:26:43 2006
@@ -8,6 +8,9 @@
     2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and VIA
     IDE on powerpc).
 
+  [ Martin Michlmayr ]
+  * [arm/armeb] Enable CONFIG_NFSD on NSLU2 again.
+
  -- Frederik Schüler <fs at debian.org>  Thu, 23 Mar 2006 18:47:46 +0100
 
 linux-2.6 (2.6.16-2) unstable; urgency=low