Commit 9e3d3619 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-soc-4.14-2' of...

Merge tag 'samsung-soc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Pull "Samsung mach/soc changes for v4.14, part 2" from Krzysztof Kozłowski:

Fix NAND ECC mode for mini2440 board.

* tag 'samsung-soc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s3c24xx: Fix NAND ECC mode for mini2440 board
parents ac9ae4df 225bd1de
...@@ -287,7 +287,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = { ...@@ -287,7 +287,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
.nr_sets = ARRAY_SIZE(mini2440_nand_sets), .nr_sets = ARRAY_SIZE(mini2440_nand_sets),
.sets = mini2440_nand_sets, .sets = mini2440_nand_sets,
.ignore_unset_ecc = 1, .ignore_unset_ecc = 1,
.ecc_mode = NAND_ECC_SOFT, .ecc_mode = NAND_ECC_HW,
}; };
/* DM9000AEP 10/100 ethernet controller */ /* DM9000AEP 10/100 ethernet controller */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment