[kernel] r6124 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm armeb hppa i386 ia64 m68k mips mipsel powerpc s390 sparc

Bastian Blank waldi at costa.debian.org
Fri Mar 10 21:04:57 UTC 2006


Author: waldi
Date: Fri Mar 10 21:04:54 2006
New Revision: 6124

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.atari
   dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/arch/m68k/config.hp
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
   dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
Log:
debian/arch: Partialy unify nfs settings.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Fri Mar 10 21:04:54 2006
@@ -1529,9 +1529,6 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Fri Mar 10 21:04:54 2006
@@ -1436,9 +1436,6 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Fri Mar 10 21:04:54 2006
@@ -1355,19 +1355,9 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=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_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Fri Mar 10 21:04:54 2006
@@ -1126,21 +1126,10 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=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
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.nslu2	Fri Mar 10 21:04:54 2006
@@ -1363,16 +1363,11 @@
 #
 # Network File Systems
 #
-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_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	Fri Mar 10 21:04:54 2006
@@ -846,20 +846,9 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=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
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	Fri Mar 10 21:04:54 2006
@@ -912,19 +912,9 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=m
-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
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -1150,7 +1140,6 @@
 CONFIG_USB_STORAGE_SDDR55=y
 # CONFIG_USB_USBNET is not set
 CONFIG_ACORN_PARTITION_ICS=y
-# CONFIG_NETPOLL_RX is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -1172,7 +1161,6 @@
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_ACORN_PARTITION_POWERTEC=y
-# CONFIG_NETPOLL_TRAP is not set
 CONFIG_USB_POWERMATE=m
 CONFIG_USB_HID=m
 # CONFIG_HID_FF is not set

Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	Fri Mar 10 21:04:54 2006
@@ -1363,16 +1363,11 @@
 #
 # Network File Systems
 #
-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_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Fri Mar 10 21:04:54 2006
@@ -809,3 +809,6 @@
 CONFIG_E1000_NAPI=y
 CONFIG_S2IO_NAPI=y
 CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_NFSD_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFS_V4=y

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Fri Mar 10 21:04:54 2006
@@ -758,13 +758,6 @@
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Fri Mar 10 21:04:54 2006
@@ -1686,9 +1686,6 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Fri Mar 10 21:04:54 2006
@@ -1193,9 +1193,6 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	Fri Mar 10 21:04:54 2006
@@ -187,11 +187,7 @@
 # CONFIG_QNX4FS_FS is not set
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
-CONFIG_NFS_V3=y
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_TCP=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	Fri Mar 10 21:04:54 2006
@@ -187,9 +187,6 @@
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_FS=m
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_LOCKD=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari	Fri Mar 10 21:04:54 2006
@@ -98,7 +98,6 @@
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_FS=m
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFSD_V4 is not set
 CONFIG_LOCKD=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	Fri Mar 10 21:04:54 2006
@@ -58,8 +58,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_SUNRPC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	Fri Mar 10 21:04:54 2006
@@ -54,8 +54,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_SUNRPC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	Fri Mar 10 21:04:54 2006
@@ -103,9 +103,6 @@
 CONFIG_HFS_FS=y
 CONFIG_HFSPLUS_FS=y
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_FS=m
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_LOCKD=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	Fri Mar 10 21:04:54 2006
@@ -67,8 +67,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_SUNRPC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	Fri Mar 10 21:04:54 2006
@@ -72,8 +72,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_SUNRPC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	Fri Mar 10 21:04:54 2006
@@ -113,8 +113,6 @@
 CONFIG_HFSPLUS_FS=m
 CONFIG_UFS_FS_WRITE=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_SUNRPC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	Fri Mar 10 21:04:54 2006
@@ -53,8 +53,6 @@
 CONFIG_HFSPLUS_FS=m
 CONFIG_UFS_FS_WRITE=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_SUNRPC=y

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	Fri Mar 10 21:04:54 2006
@@ -1232,20 +1232,16 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=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=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	Fri Mar 10 21:04:54 2006
@@ -1352,20 +1352,16 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=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=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	Fri Mar 10 21:04:54 2006
@@ -1681,20 +1681,16 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=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=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	Fri Mar 10 21:04:54 2006
@@ -1459,20 +1459,14 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-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
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	Fri Mar 10 21:04:54 2006
@@ -1680,20 +1680,16 @@
 # Network File Systems
 #
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=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=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Fri Mar 10 21:04:54 2006
@@ -1156,9 +1156,7 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	Fri Mar 10 21:04:54 2006
@@ -134,9 +134,6 @@
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_NFS_V4 is not set
-CONFIG_NFS_DIRECTIO=y
-# CONFIG_NFSD_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	Fri Mar 10 21:04:54 2006
@@ -257,9 +257,7 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32	Fri Mar 10 21:04:54 2006
@@ -999,22 +999,10 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
-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
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m



More information about the Kernel-svn-changes mailing list