summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/configs/BlackStamp_defconfig
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-04-17 00:21:46 -0700
committerSteven Miao <realmz6@gmail.com>2014-06-12 16:58:50 +0800
commit51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (patch)
tree9e337e48d9677262c8392a7c3387a9ef687a824a /arch/blackfin/configs/BlackStamp_defconfig
parentff5ae12d84d3f7eaeb3850ff6de4289c0c849344 (diff)
downloadtalos-op-linux-51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8.tar.gz
talos-op-linux-51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8.zip
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
These defconfigs contain the CONFIG_M25P80 symbol, which is now dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to the relevant defconfigs. At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Steven Miao <realmz6@gmail.com> Cc: adi-buildroot-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/blackfin/configs/BlackStamp_defconfig')
-rw-r--r--arch/blackfin/configs/BlackStamp_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig
index 3853c473b443..f4a9200e1ab1 100644
--- a/arch/blackfin/configs/BlackStamp_defconfig
+++ b/arch/blackfin/configs/BlackStamp_defconfig
@@ -45,7 +45,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=m
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=m
CONFIG_MTD_CFI_AMDSTD=m
@@ -53,7 +52,7 @@ CONFIG_MTD_RAM=y
CONFIG_MTD_ROM=m
CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_M25P80=y
-# CONFIG_M25PXX_USE_FAST_READ is not set
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NBD=y
CONFIG_BLK_DEV_RAM=y
OpenPOWER on IntegriCloud