diff options
author | Olaf Hering <olh@suse.de> | 2005-10-28 20:46:54 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-29 01:14:44 -0400 |
commit | 18f568b79bf698aea9a78b63782398c914241ad8 (patch) | |
tree | 8898d7d8dadcbe27344e601170c2c8c34155a8d1 /arch/ppc64/defconfig | |
parent | 08124f958997ac14bb2284af787752125a892e9f (diff) |
[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/defconfig')
-rw-r--r-- | arch/ppc64/defconfig | 4 |
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 | |||
1318 | # | 1318 | # |
1319 | CONFIG_NLS=y | 1319 | CONFIG_NLS=y |
1320 | CONFIG_NLS_DEFAULT="iso8859-1" | 1320 | CONFIG_NLS_DEFAULT="iso8859-1" |
1321 | CONFIG_NLS_CODEPAGE_437=m | 1321 | CONFIG_NLS_CODEPAGE_437=y |
1322 | CONFIG_NLS_CODEPAGE_737=m | 1322 | CONFIG_NLS_CODEPAGE_737=m |
1323 | CONFIG_NLS_CODEPAGE_775=m | 1323 | CONFIG_NLS_CODEPAGE_775=m |
1324 | CONFIG_NLS_CODEPAGE_850=m | 1324 | CONFIG_NLS_CODEPAGE_850=m |
@@ -1342,7 +1342,7 @@ CONFIG_NLS_ISO8859_8=m | |||
1342 | CONFIG_NLS_CODEPAGE_1250=m | 1342 | CONFIG_NLS_CODEPAGE_1250=m |
1343 | CONFIG_NLS_CODEPAGE_1251=m | 1343 | CONFIG_NLS_CODEPAGE_1251=m |
1344 | CONFIG_NLS_ASCII=m | 1344 | CONFIG_NLS_ASCII=m |
1345 | CONFIG_NLS_ISO8859_1=m | 1345 | CONFIG_NLS_ISO8859_1=y |
1346 | CONFIG_NLS_ISO8859_2=m | 1346 | CONFIG_NLS_ISO8859_2=m |
1347 | CONFIG_NLS_ISO8859_3=m | 1347 | CONFIG_NLS_ISO8859_3=m |
1348 | CONFIG_NLS_ISO8859_4=m | 1348 | CONFIG_NLS_ISO8859_4=m |