* 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
This commit is contained in:
parent
e5436e3974
commit
b7c4d19d15
|
@ -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 <ben@decadent.org.uk> Sun, 10 Jan 2010 17:38:50 +0000
|
||||
|
||||
linux-2.6 (2.6.32-5) unstable; urgency=low
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue