diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 05:08:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 05:08:47 +0200 |
| commit | 88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb (patch) | |
| tree | 5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649 /arch/blackfin/configs/BF527-EZKIT_defconfig | |
| parent | Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80) (diff) | |
| download | linux-88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb.tar.xz 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/BF527-EZKIT_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF527-EZKIT_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 2e73a5d33da8..99c131ba7d90 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig @@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_RAM=y @@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set |