summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/kirkwood_defconfig
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-05-01 08:26:43 +0200
committerJason Cooper <jason@lakedaemon.net>2014-05-05 03:02:02 +0200
commit809aa6f1b4ce8322e32725437837fb92c2eaf4c8 (patch)
tree169a1455ecece0b49629dd52cead93cfb8faeadb /arch/arm/configs/kirkwood_defconfig
parentARM: configs: add ahci_mvebu to mvebu_v7_defconfig (diff)
downloadlinux-809aa6f1b4ce8322e32725437837fb92c2eaf4c8.tar.xz
linux-809aa6f1b4ce8322e32725437837fb92c2eaf4c8.zip
ARM: mvebu: defconfig: 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 satisfy the new dependency. At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Link: https://lkml.kernel.org/r/1398925607-7482-9-git-send-email-computersforpeace@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/configs/kirkwood_defconfig')
-rw-r--r--arch/arm/configs/kirkwood_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 2e762d94e94b..b9e480c10b10 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -61,6 +61,7 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_EEPROM_AT24=y
# CONFIG_SCSI_PROC_FS is not set