From 64855ce2ad43f95dd268675fc7fdcd4cff30bd54 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 15 May 2017 09:35:36 -0500 Subject: Merge in some Yocto 2.1 code. --- recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig') diff --git a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig index 82dc224..58025f7 100644 --- a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig +++ b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig @@ -963,11 +963,8 @@ CONFIG_MTD_CFI_I2=y # Self-contained MTD device drivers # # CONFIG_MTD_DATAFLASH is not set -<<<<<<< HEAD CONFIG_MTD_M25P80=m -======= -# CONFIG_MTD_M25P80 is not set ->>>>>>> Initial commit of Yocto 2.1 changes + # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -- cgit v1.2.3