ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
authorBrian Norris <computersforpeace@gmail.com>
Thu, 1 May 2014 06:26:41 +0000 (23:26 -0700)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Tue, 2 Sep 2014 08:36:13 +0000 (10:36 +0200)
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>
arch/arm/configs/sama5_defconfig

index 4414990521d31e3144da57133127a7663674313e..5f2b36dedefff6223783677d9c228164fa27f16f 100644 (file)
@@ -65,12 +65,12 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_PROC_DEVICETREE=y