summaryrefslogtreecommitdiffstats
path: root/arch/ppc64
diff options
context:
space:
mode:
authorOlaf Hering2005-10-29 02:46:54 +0200
committerPaul Mackerras2005-10-29 07:14:44 +0200
commit18f568b79bf698aea9a78b63782398c914241ad8 (patch)
tree8898d7d8dadcbe27344e601170c2c8c34155a8d1 /arch/ppc64
parent[PATCH] ppc64: AC Power handling broken for desktops (diff)
downloadkernel-qcow2-linux-18f568b79bf698aea9a78b63782398c914241ad8.tar.gz
kernel-qcow2-linux-18f568b79bf698aea9a78b63782398c914241ad8.tar.xz
kernel-qcow2-linux-18f568b79bf698aea9a78b63782398c914241ad8.zip
[PATCH] ppc64: compile nls_cp437 and nls_iso8859_1 into the kernel in defconfig
compile nls_cp437 and nls_iso8859_1 into the kernel in defconfig. This is already enabled in pSeries_defconfig. Reason: if one just boots the new shiny zImage and the root filesystem is on a filesystem not readable by yaboot (like jfs, raid or lvm) upgrading the bootloader will fail because the FAT bootpartition can not be mounted. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64')
-rw-r--r--arch/ppc64/defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig
index 37c157c93cef..e79fd60bc122 100644
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/defconfig
@@ -1318,7 +1318,7 @@ CONFIG_MSDOS_PARTITION=y
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
CONFIG_NLS_CODEPAGE_850=m
@@ -1342,7 +1342,7 @@ CONFIG_NLS_ISO8859_8=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
CONFIG_NLS_ISO8859_4=m