From b7c4d19d15b865e1c2c96f5225e3a1dd961530df Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 21 Jan 2010 16:42:53 +0000 Subject: [PATCH] * 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. svn path=/dists/trunk/linux-2.6/; revision=14974 --- debian/changelog | 3 +++ debian/config/config | 6 +++--- debian/config/m68k/config.amiga | 6 ------ debian/config/m68k/config.atari | 6 ------ debian/config/m68k/config.bvme6000 | 6 ------ debian/config/m68k/config.hp | 2 -- debian/config/m68k/config.mac | 6 ------ debian/config/m68k/config.mvme147 | 6 ------ debian/config/m68k/config.mvme16x | 6 ------ debian/config/m68k/config.q40 | 2 -- debian/config/m68k/config.sun3 | 2 -- debian/config/mips/config.4kc-malta | 12 ------------ 12 files changed, 6 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index cddd5716f..a0b15a39d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,9 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low [ Julien Cristau ] * drm/i915: disable powersave by default (closes: #564807) + [ Bastian Blank ] + * Enable all NCP file system options. + -- Ben Hutchings Sun, 10 Jan 2010 17:38:50 +0000 linux-2.6 (2.6.32-5) unstable; urgency=low diff --git a/debian/config/config b/debian/config/config index 3d76b2a36..bc9a6253c 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2881,9 +2881,9 @@ CONFIG_MINIX_FS=m ## 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 diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index d511093a1..343f75c4a 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -242,12 +242,6 @@ CONFIG_HFS_FS=m ## CONFIG_HFSPLUS_FS=m -## -## file: fs/ncpfs/Kconfig -## -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y - ## ## file: fs/partitions/Kconfig ## diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari index 4e4e996c6..149c439d8 100644 --- a/debian/config/m68k/config.atari +++ b/debian/config/m68k/config.atari @@ -159,12 +159,6 @@ CONFIG_HFS_FS=m ## CONFIG_HFSPLUS_FS=m -## -## file: fs/ncpfs/Kconfig -## -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y - ## ## file: fs/nfs/Kconfig ## diff --git a/debian/config/m68k/config.bvme6000 b/debian/config/m68k/config.bvme6000 index e9b816e10..622a7ee48 100644 --- a/debian/config/m68k/config.bvme6000 +++ b/debian/config/m68k/config.bvme6000 @@ -88,12 +88,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4 ## # CONFIG_FB is not set -## -## file: fs/ncpfs/Kconfig -## -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y - ## ## file: fs/nfs/Kconfig ## diff --git a/debian/config/m68k/config.hp b/debian/config/m68k/config.hp index f7e162c8f..8c5d998a5 100644 --- a/debian/config/m68k/config.hp +++ b/debian/config/m68k/config.hp @@ -49,7 +49,5 @@ CONFIG_LOCKD=y 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 diff --git a/debian/config/m68k/config.mac b/debian/config/m68k/config.mac index 6645a684b..9e109279c 100644 --- a/debian/config/m68k/config.mac +++ b/debian/config/m68k/config.mac @@ -159,12 +159,6 @@ CONFIG_HFS_FS=y ## CONFIG_HFSPLUS_FS=y -## -## file: fs/ncpfs/Kconfig -## -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y - ## ## file: fs/partitions/Kconfig ## diff --git a/debian/config/m68k/config.mvme147 b/debian/config/m68k/config.mvme147 index 0be039028..5667a61bb 100644 --- a/debian/config/m68k/config.mvme147 +++ b/debian/config/m68k/config.mvme147 @@ -101,12 +101,6 @@ CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y 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 ## diff --git a/debian/config/m68k/config.mvme16x b/debian/config/m68k/config.mvme16x index a7837881c..6e2354948 100644 --- a/debian/config/m68k/config.mvme16x +++ b/debian/config/m68k/config.mvme16x @@ -107,12 +107,6 @@ CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y 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 ## diff --git a/debian/config/m68k/config.q40 b/debian/config/m68k/config.q40 index 783dcfcf3..67c3ad125 100644 --- a/debian/config/m68k/config.q40 +++ b/debian/config/m68k/config.q40 @@ -100,7 +100,5 @@ CONFIG_LOCKD=y 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 diff --git a/debian/config/m68k/config.sun3 b/debian/config/m68k/config.sun3 index 194f780a8..91ae49d79 100644 --- a/debian/config/m68k/config.sun3 +++ b/debian/config/m68k/config.sun3 @@ -48,8 +48,6 @@ CONFIG_LOCKD=y 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 diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index e4bbd5724..e135c2937 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1237,18 +1237,6 @@ CONFIG_EXT2_FS=y ## 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 ##