[kernel] r10922 - in dists/sid/linux-2.6/debian: . config/mips

[Martin Michlmayr]

Author: tbm
Date: Wed Mar 19 16:30:24 2008
New Revision: 10922

Log:
revert, this changes the ABI


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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Mar 19 16:30:24 2008
@@ -47,10 +47,6 @@
   [ dann frazier ]
   * Fix missing multicast addresses (closes: #466719)
 
-  [ Martin Michlmayr ]
-  * [mips/r5k-ip32] Use the generic config options for NFS, which will
-    enable NFSv4. (closes: #471007)
-
  -- dann frazier <dannf at debian.org>  Mon, 10 Mar 2008 14:03:59 -0600
 
 linux-2.6 (2.6.24-4) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32	(original)
+++ dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32	Wed Mar 19 16:30:24 2008
@@ -937,8 +937,19 @@
 # Network File Systems
 #
 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
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set