summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux/linux-3.12.70
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-05-15 09:35:36 -0500
committerJohn Klug <john.klug@multitech.com>2017-06-09 09:09:19 -0500
commit64855ce2ad43f95dd268675fc7fdcd4cff30bd54 (patch)
tree55666279de5d967f98834deb78a6d7495539aa54 /recipes-kernel/linux/linux-3.12.70
parente2f2dce006439e3c7a35737b15ed7da03ba0bc2a (diff)
downloadmeta-multitech-atmel-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.tar.gz
meta-multitech-atmel-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.tar.bz2
meta-multitech-atmel-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.zip
Merge in some Yocto 2.1 code.
Diffstat (limited to 'recipes-kernel/linux/linux-3.12.70')
-rw-r--r--recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig5
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