From 57388244cfa34f85b5608fd3ab7058287e5aa135 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 27 Jul 2013 22:55:16 +0000 Subject: [PATCH] Update config as requested by Thorsten Glaser * nfs: Enable swap on NFS * fs/nls: Enable Macintosh HFS+ codepage modules svn path=/dists/sid/linux/; revision=20414 --- debian/changelog | 4 +++- debian/config/config | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5551b43cc..e32d6aab4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,7 +95,7 @@ linux (3.10.3-1) UNRELEASED; urgency=low * 9p: fix off by one causing access violations and memory corruption [ Thorsten Glaser ] - * Update m68k configs: + * Update m68k configs (Closes: #717689): - disable some functionality due to size constraints - switch to using initrd - drop all flavours; build a generic image that runs on @@ -103,6 +103,8 @@ linux (3.10.3-1) UNRELEASED; urgency=low old BVME6000, MVME147, MVME16x, new Apollo, Q40/Q60 untested) - use gcc-4.8 - add patch to make Atari EtherNAT actually selectable + * nfs: Enable swap on NFS + * fs/nls: Enable Macintosh HFS+ codepage modules -- Arnaud Patard Tue, 16 Jul 2013 08:19:29 +0200 diff --git a/debian/config/config b/debian/config/config index 828d852bb..9f574da33 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3989,6 +3989,7 @@ CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set @@ -4048,6 +4049,17 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=m ##