diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-04 08:59:06 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-04 08:59:06 +1000 |
commit | 75d43b2d0a323ba894d85060888f039e41b441ca (patch) | |
tree | 2f49ace1f85510e8b21974e6dd45dfcc2a87666a /arch/powerpc/configs/mpc86xx_defconfig | |
parent | d0b7abb2c7c05552aca2a0358c53b6a48eab2843 (diff) | |
parent | cb0446c1b625326682ec4f9d1dd10779433646bc (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
Freescale updates from Scott (27 commits):
"Highlights include DMA32 zone support (SATA, USB, etc now works on 64-bit
FSL kernels), MSI changes, 8xx optimizations and cleanup, t104x board
support, and PrPMC PCI enumeration."
Diffstat (limited to 'arch/powerpc/configs/mpc86xx_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc86xx_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig index 35595ea74ff4..fc58aa8a89e4 100644 --- a/arch/powerpc/configs/mpc86xx_defconfig +++ b/arch/powerpc/configs/mpc86xx_defconfig @@ -145,6 +145,9 @@ CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_ADFS_FS=m |