| commit | e51162f4d5928277dc3a429f0e319f85bc97752e | [log] [tgz] |
|---|---|---|
| author | Denton Gentry <dgentry@google.com> | Tue Feb 10 06:35:38 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 10 06:35:38 2015 +0000 |
| tree | 8ea49a89fed7c445c0b8d1032b85b9dcf60f45f6 | |
| parent | cea4f229206046b5cde84faf11157b0637b404f2 [diff] | |
| parent | 7b20eb1ce1ab37409d36aa8d4f2a0c5358b87220 [diff] |
Merge "Avoid PLL[0-3] definition conflicts."
diff --git a/arch/arm/configs/gfsc100_defconfig b/arch/arm/configs/gfsc100_defconfig index 31511c7..2ea94ac 100644 --- a/arch/arm/configs/gfsc100_defconfig +++ b/arch/arm/configs/gfsc100_defconfig
@@ -167,9 +167,6 @@ CONFIG_MTD_RAM=y CONFIG_MTD_ROM=y CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ECC_BCH=y -CONFIG_MTD_NAND_COMCERTO=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=128 CONFIG_MTD_UBI_BEB_RESERVE=25