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

[Bastian Blank]

Author: waldi
Date: Thu Jan 21 16:42:53 2010
New Revision: 14974

Log:
* debian/changelog: Update.
* debian/config/config:
  Set NCPFS_PACKET_SIGNING, NCPFS_IOCTL_LOCKING, NCPFS_STRONG.
* debian/config/m68k, debian/config/mips/config.4kc-malta: Remove overrides.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/m68k/config.amiga
   dists/trunk/linux-2.6/debian/config/m68k/config.atari
   dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/config/m68k/config.hp
   dists/trunk/linux-2.6/debian/config/m68k/config.mac
   dists/trunk/linux-2.6/debian/config/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/config/m68k/config.q40
   dists/trunk/linux-2.6/debian/config/m68k/config.sun3
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jan 21 16:42:53 2010	(r14974)
@@ -40,6 +40,9 @@
   [ Julien Cristau ]
   * drm/i915: disable powersave by default (closes: #564807)
 
+  [ Bastian Blank ]
+  * Enable all NCP file system options.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 
 linux-2.6 (2.6.32-5) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Jan 21 16:42:53 2010	(r14974)
@@ -2881,9 +2881,9 @@
 ## file: fs/ncpfs/Kconfig
 ##
 CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_OS2_NS=y
 # CONFIG_NCPFS_SMALLDOS is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Thu Jan 21 16:42:53 2010	(r14974)
@@ -243,12 +243,6 @@
 CONFIG_HFSPLUS_FS=m
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-
-##
 ## file: fs/partitions/Kconfig
 ##
 # CONFIG_PARTITION_ADVANCED is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari	Thu Jan 21 16:42:53 2010	(r14974)
@@ -160,12 +160,6 @@
 CONFIG_HFSPLUS_FS=m
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-
-##
 ## file: fs/nfs/Kconfig
 ##
 # CONFIG_NFS_V4 is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000	Thu Jan 21 16:42:53 2010	(r14974)
@@ -89,12 +89,6 @@
 # CONFIG_FB is not set
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-
-##
 ## file: fs/nfs/Kconfig
 ##
 CONFIG_NFS_FS=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.hp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.hp	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.hp	Thu Jan 21 16:42:53 2010	(r14974)
@@ -49,7 +49,5 @@
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac	Thu Jan 21 16:42:53 2010	(r14974)
@@ -160,12 +160,6 @@
 CONFIG_HFSPLUS_FS=y
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-
-##
 ## file: fs/partitions/Kconfig
 ##
 CONFIG_AMIGA_PARTITION=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mvme147	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mvme147	Thu Jan 21 16:42:53 2010	(r14974)
@@ -102,12 +102,6 @@
 CONFIG_LOGO_LINUX_CLUT224=y
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-
-##
 ## file: fs/nfs/Kconfig
 ##
 CONFIG_NFS_FS=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x	Thu Jan 21 16:42:53 2010	(r14974)
@@ -108,12 +108,6 @@
 CONFIG_LOGO_LINUX_CLUT224=y
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-
-##
 ## file: fs/nfs/Kconfig
 ##
 CONFIG_NFS_FS=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.q40	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.q40	Thu Jan 21 16:42:53 2010	(r14974)
@@ -100,7 +100,5 @@
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.sun3
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.sun3	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.sun3	Thu Jan 21 16:42:53 2010	(r14974)
@@ -48,8 +48,6 @@
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Thu Jan 21 16:29:34 2010	(r14973)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Thu Jan 21 16:42:53 2010	(r14974)
@@ -1238,18 +1238,6 @@
 CONFIG_EXT3_FS=y
 
 ##
-## file: fs/ncpfs/Kconfig
-##
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-# CONFIG_NCPFS_SMALLDOS is not set
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-
-##
 ## file: fs/nfs/Kconfig
 ##
 CONFIG_NFS_FS=y