[kernel] r10905 - in dists/trunk/linux-2.6/debian: . config/mips

[Martin Michlmayr]

Author: tbm
Date: Mon Mar 17 08:34:49 2008
New Revision: 10905

Log:
Use the generic config options for NFS, which will
enable NFSv4. (closes: #471007)


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Mar 17 08:34:49 2008
@@ -46,6 +46,9 @@
     fix the debian-installer startup hang on Qube 2700.
   * [arm/footbridge] Disable KEYS and SECURITY for smaller d-i image.
   * [arm/footbridge] Build NFS as a module to make the image smaller.
+  * [mips/r5k-ip32] Don't build in NFS.
+  * [mips/r5k-ip32] Use the generic config options for NFS, which will
+    enable NFSv4. (closes: #471007)
 
   [ Daniel Baumann ]
   * Added patch from unionfs upstream to export release_open_intent symbol.

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Mon Mar 17 08:34:49 2008
@@ -685,18 +685,6 @@
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_NCP_FS is not set