diff options
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
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 |