diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 20:08:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 20:08:47 -0700 |
| commit | 88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb (patch) | |
| tree | 5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649 /arch/blackfin/configs/BF548-EZKIT_defconfig | |
| parent | 71998d1be4ae70e7d320cdd21595c1a02a29c61e (diff) | |
| parent | 51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (diff) | |
| download | blackbird-op-linux-88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb.tar.gz blackbird-op-linux-88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb.zip | |
Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Revert "blackfin: dma: current count mmr is read only"
bf533: fix build error: add linux/gpio.h
Diffstat (limited to 'arch/blackfin/configs/BF548-EZKIT_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF548-EZKIT_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index f0a2ddf5de46..38cb17d218d4 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig @@ -64,7 +64,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_FW_LOADER=m CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y @@ -75,6 +74,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BF5XX=y # CONFIG_MTD_NAND_BF5XX_HWECC is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y |
