diff options
Diffstat (limited to 'recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig')
| -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 |