[Devil-linux-commit] build/scripts/config/linux-2.6 config_linux, 1.42, 1.43 config_linux.686, 1.5, 1.6

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/config/linux-2.6
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30490/d/config/linux-2.6

Modified Files:
	config_linux config_linux.686 
Log Message:

- added nfsv4
- updated ucarp to 1.3
- removed duplicate from quota-tools


Index: config_linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- config_linux	6 Aug 2007 06:09:50 -0000	1.42
+++ config_linux	31 Aug 2007 08:28:24 -0000	1.43
@@ -90,8 +90,8 @@
 #
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
@@ -2440,8 +2440,6 @@
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
 CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="cp437"

Index: config_linux.686
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux.686,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config_linux.686	6 Aug 2007 06:09:50 -0000	1.5
+++ config_linux.686	31 Aug 2007 08:28:24 -0000	1.6
@@ -90,8 +90,8 @@
 #
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
 #CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
@@ -2540,8 +2540,6 @@
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
 CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="cp437"