diff options
| author | John Klug <john.klug@multitech.com> | 2017-05-12 18:26:28 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-06-09 09:09:19 -0500 |
| commit | e2f2dce006439e3c7a35737b15ed7da03ba0bc2a (patch) | |
| tree | 9f84c5fb98d6fea84e4c9878880298248e08a28a /recipes-kernel | |
| parent | 06f304cec0ee3260ccd28bcc47d591eb1fca257d (diff) | |
| download | meta-multitech-e2f2dce006439e3c7a35737b15ed7da03ba0bc2a.tar.gz meta-multitech-e2f2dce006439e3c7a35737b15ed7da03ba0bc2a.tar.bz2 meta-multitech-e2f2dce006439e3c7a35737b15ed7da03ba0bc2a.zip | |
Merging morty with master (Daisy).
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig index 9f5265e..82dc224 100644 --- a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig +++ b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig @@ -963,7 +963,11 @@ 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 |