summaryrefslogtreecommitdiff
path: root/arch/blackfin/configs/BF526-EZBRD_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-12 20:08:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-12 20:08:47 -0700
commit88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb (patch)
tree5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649 /arch/blackfin/configs/BF526-EZBRD_defconfig
parent71998d1be4ae70e7d320cdd21595c1a02a29c61e (diff)
parent51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (diff)
downloadlinux-sh-88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb.tar.gz
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/BF526-EZBRD_defconfig')
-rw-r--r--arch/blackfin/configs/BF526-EZBRD_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig
index 1759fad54017..e66ba31ef84d 100644
--- a/arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@ -53,7 +53,6 @@ CONFIG_IP_PNP=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
@@ -63,6 +62,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=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