From 4d62eb5a6390e2f07fe0cfb01f5f430564f1d446 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Wed, 21 Sep 2016 13:48:56 -0600 Subject: [PATCH] UBUNTU: [Config] CONFIG_NLS_CODEPAGE_437=y BugLink: http://bugs.launchpad.net/bugs/1626158 Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.flavour.generic | 1 - debian.master/config/powerpc/config.flavour.powerpc-e500mc | 1 - debian.master/config/powerpc/config.flavour.powerpc-smp | 1 - debian.master/config/powerpc/config.flavour.powerpc64-emb | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 11 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index c1442095c36e..599eac1b10bf 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -849,7 +849,6 @@ CONFIG_NFC_HCI=m # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NFTL=m CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m CONFIG_NODES_SHIFT=6 CONFIG_NODES_SPAN_OTHER_NODES=y # CONFIG_NOP_USB_XCEIV is not set diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 7c340d6ec0a6..61bda5dccd4a 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -865,7 +865,6 @@ CONFIG_NET_TULIP=y # CONFIG_NFS_V4_1_MIGRATION is not set # CONFIG_NFTL is not set CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m CONFIG_NODES_SHIFT=6 # CONFIG_NOP_USB_XCEIV is not set # CONFIG_NO_HZ is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index b87eca04db72..40a2a1ef4faf 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -894,7 +894,6 @@ CONFIG_NET_TULIP=y # CONFIG_NFS_V4_1_MIGRATION is not set # CONFIG_NFTL is not set CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m CONFIG_NOP_USB_XCEIV=m # CONFIG_NO_HZ is not set CONFIG_NR_CPUS=8 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index b1efcbaa4547..4693f1db8285 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4774,6 +4774,7 @@ CONFIG_NLS=y CONFIG_NLS_ASCII=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 2e282b965751..06f6c0a0c706 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -896,7 +896,6 @@ CONFIG_NFC_HCI=m # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NFTL=m CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m # CONFIG_NOP_USB_XCEIV is not set # CONFIG_NO_HZ is not set CONFIG_NR_CPUS=32 diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic index d81d342f67e5..bfff6ed195cb 100644 --- a/debian.master/config/powerpc/config.flavour.generic +++ b/debian.master/config/powerpc/config.flavour.generic @@ -613,7 +613,6 @@ CONFIG_NET_MPLS_GSO=y # CONFIG_NFSD_SCSILAYOUT is not set # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m CONFIG_NONSTATIC_KERNEL=y # CONFIG_NOP_USB_XCEIV is not set # CONFIG_NO_HZ is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc index 8a5efdb79282..df194d425b27 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc +++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc @@ -626,7 +626,6 @@ CONFIG_NFP_NETVF=m CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFS_V4_1_MIGRATION=y # CONFIG_NF_CONNTRACK_PROCFS is not set -CONFIG_NLS_CODEPAGE_437=y CONFIG_NONSTATIC_KERNEL=y CONFIG_NOP_USB_XCEIV=m CONFIG_NO_HZ=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index e5e395f061d6..440cd4740803 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -624,7 +624,6 @@ CONFIG_NET_MPLS_GSO=y # CONFIG_NFSD_SCSILAYOUT is not set # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m # CONFIG_NONSTATIC_KERNEL is not set # CONFIG_NOP_USB_XCEIV is not set # CONFIG_NO_HZ is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb index c91c3f8858e3..ee316f2487ad 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-emb +++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb @@ -631,7 +631,6 @@ CONFIG_NFP_NETVF=m CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFS_V4_1_MIGRATION=y # CONFIG_NF_CONNTRACK_PROCFS is not set -CONFIG_NLS_CODEPAGE_437=y CONFIG_NONSTATIC_KERNEL=y CONFIG_NOP_USB_XCEIV=m CONFIG_NO_HZ=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 6136e0378712..a34a25cd7c83 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -836,7 +836,6 @@ CONFIG_NET_TULIP=y # CONFIG_NFSD_SCSILAYOUT is not set # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m CONFIG_NODES_SHIFT=8 CONFIG_NODES_SPAN_OTHER_NODES=y CONFIG_NONSTATIC_KERNEL=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index ab29571d6eba..ceed5e5fd462 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -608,7 +608,6 @@ CONFIG_NET_MPLS_GSO=y # CONFIG_NFS_V4_1_MIGRATION is not set # CONFIG_NFTL is not set CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NLS_CODEPAGE_437=m # CONFIG_NODES_SPAN_OTHER_NODES is not set # CONFIG_NOP_USB_XCEIV is not set # CONFIG_NO_HZ is not set -- 2.39.5