diff options
author | Brian Norris <computersforpeace@gmail.com> | 2014-05-01 02:26:41 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-02 04:36:13 -0400 |
commit | d6b9302f79783dc79a5a1f99efb2f727316004b4 (patch) | |
tree | 434d18179560416ac9c25c0bee50d4f0f0620e8d /arch/arm/configs | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) |
ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 4414990521d3..5f2b36dedeff 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig | |||
@@ -65,12 +65,12 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
65 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 65 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
66 | CONFIG_MTD=y | 66 | CONFIG_MTD=y |
67 | CONFIG_MTD_CMDLINE_PARTS=y | 67 | CONFIG_MTD_CMDLINE_PARTS=y |
68 | CONFIG_MTD_CHAR=y | ||
69 | CONFIG_MTD_BLOCK=y | 68 | CONFIG_MTD_BLOCK=y |
70 | CONFIG_MTD_CFI=y | 69 | CONFIG_MTD_CFI=y |
71 | CONFIG_MTD_M25P80=y | 70 | CONFIG_MTD_M25P80=y |
72 | CONFIG_MTD_NAND=y | 71 | CONFIG_MTD_NAND=y |
73 | CONFIG_MTD_NAND_ATMEL=y | 72 | CONFIG_MTD_NAND_ATMEL=y |
73 | CONFIG_MTD_SPI_NOR=y | ||
74 | CONFIG_MTD_UBI=y | 74 | CONFIG_MTD_UBI=y |
75 | CONFIG_MTD_UBI_GLUEBI=y | 75 | CONFIG_MTD_UBI_GLUEBI=y |
76 | CONFIG_PROC_DEVICETREE=y | 76 | CONFIG_PROC_DEVICETREE=y |