From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Norris To: Linux Kernel Subject: [PATCH v2 06/12] ARM: at91: add MTD_SPI_NOR (new dependency for M25P80) Date: Wed, 30 Apr 2014 23:26:41 -0700 Message-Id: <1398925607-7482-7-git-send-email-computersforpeace@gmail.com> In-Reply-To: <1398925607-7482-1-git-send-email-computersforpeace@gmail.com> References: <1398925607-7482-1-git-send-email-computersforpeace@gmail.com> Cc: Marek Vasut , Nicolas Ferre , Huang Shijie , linux-mtd@lists.infradead.org, Brian Norris , Jean-Christophe Plagniol-Villard , Andrew Victor , linux-arm-kernel@lists.infradead.org List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Cc: Andrew Victor Cc: Nicolas Ferre Cc: Jean-Christophe Plagniol-Villard Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/configs/sama5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index dc3881e07630..8282ebab6e52 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -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 -- 1.8.3.2