diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-07 18:15:43 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-07 18:15:43 (GMT) |
| commit | 78f1554f2ac9a8a3dd622fa49f4623cddba9e036 (patch) | |
| tree | b488208f99a90f1966ba8d7803cd5ddcc287a1fa /arch/powerpc | |
| parent | 188c08c4064ffc2fa303b8512a673016d1d4071c (diff) | |
| parent | db651a6e8e0df939cb977a8799816c04b07506c3 (diff) | |
| download | linux-fsl-qoriq-78f1554f2ac9a8a3dd622fa49f4623cddba9e036.tar.xz | |
Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8
Conflicts temporarily resolved for:
drivers/net/ethernet/freescale/dpa/dpaa_eth.c
Permanent solution needs to be provided by the author of
commit ec6aa025.
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/85xx/bsc913x_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/bsc913x_smp_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/e6500rev1_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/e6500rev2_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/p1023rds_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc86xx_defconfig | 3 |
8 files changed, 24 insertions, 0 deletions
diff --git a/arch/powerpc/configs/85xx/bsc913x_defconfig b/arch/powerpc/configs/85xx/bsc913x_defconfig index ef9b607..10f037d 100644 --- a/arch/powerpc/configs/85xx/bsc913x_defconfig +++ b/arch/powerpc/configs/85xx/bsc913x_defconfig @@ -178,6 +178,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_JFFS2_FS=y diff --git a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig index a2df1fa..6fd47773 100644 --- a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig +++ b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig @@ -180,6 +180,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_JFFS2_FS=y diff --git a/arch/powerpc/configs/85xx/e6500rev1_defconfig b/arch/powerpc/configs/85xx/e6500rev1_defconfig index 331835e..61a7b9f 100644 --- a/arch/powerpc/configs/85xx/e6500rev1_defconfig +++ b/arch/powerpc/configs/85xx/e6500rev1_defconfig @@ -161,6 +161,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_HUGETLBFS=y diff --git a/arch/powerpc/configs/85xx/e6500rev2_defconfig b/arch/powerpc/configs/85xx/e6500rev2_defconfig index 819d403..db6a445 100644 --- a/arch/powerpc/configs/85xx/e6500rev2_defconfig +++ b/arch/powerpc/configs/85xx/e6500rev2_defconfig @@ -159,6 +159,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_HUGETLBFS=y diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig index 3e73134..efe0e4a 100644 --- a/arch/powerpc/configs/85xx/p1023rds_defconfig +++ b/arch/powerpc/configs/85xx/p1023rds_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 diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index c9bb1de..87cbf3e 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -205,6 +205,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_HUGETLBFS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 6620319..16c9743 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -217,6 +217,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_HUGETLBFS=y diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig index a1cc817..6727fb9 100644 --- a/arch/powerpc/configs/mpc86xx_defconfig +++ b/arch/powerpc/configs/mpc86xx_defconfig @@ -146,6 +146,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 |