UBUNTU: [Config] CONFIG_NLS_CODEPAGE_437=y

BugLink: http://bugs.launchpad.net/bugs/1626158
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c1442095c36ed70c21164f4a2b35a3ac4992da78..599eac1b10bfb802733d3a1ea9d57a8723b7760a 100644 (file)
--- 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 7c340d6ec0a6ab7b84e0cc66c444e8009ff1281d..61bda5dccd4a83961cb96f380b16e31db65fdd0c 100644 (file)
--- 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 b87eca04db72847211a46e1a83fa32f6d45d4c9b..40a2a1ef4faf450fadf8beb814fbf302b04bba28 100644 (file)
--- 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 b1efcbaa45478faba7e0b2c8456b0f7765955d9b..4693f1db8285f9dbafe5f4f47a0d32b1b8ff9592 100644 (file)
--- 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 2e282b965751c8c6656851528f1dd841d4ff403f..06f6c0a0c706c672395424265c270e6e46bc1283 100644 (file)
--- 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 d81d342f67e51bc7c5b092f614a1562206409266..bfff6ed195cb3f24936299a074840652b52abab1 100644 (file)
--- 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 8a5efdb7928276d13ecf5be9dd80011093884f40..df194d425b27c110981fda41128d815432c1a22b 100644 (file)
--- 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 e5e395f061d640f7ca266029ea5bf4338ecd46fa..440cd4740803091fb7f4b9d02f4e96747c3e56b3 100644 (file)
--- 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 c91c3f8858e3b2055a090216818d340ff9641022..ee316f2487addce5781557b1d0b9004b654563f9 100644 (file)
--- 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 6136e0378712ce22ade5590cc2568f86681b1716..a34a25cd7c836591823f7bd8fb8b035a4879e1f7 100644 (file)
--- 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 ab29571d6eba3d03a342ad5ee147520876db19c9..ceed5e5fd462ce93a2b3ead18af37660f122311f 100644 (file)
--- 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