summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-29 14:46:54 -0800
committerOlof Johansson <olof@lixom.net>2017-01-29 14:46:54 -0800
commitde474f9b9724c683789bda823c1a80d703738a45 (patch)
treebb7ef7ee4f6631cc07c51803cbd4156b365874db /arch/arm/configs
parentb5f8c90c75106f1167615f26b13927a05a1da9a7 (diff)
parenta2735c3067e7c25c46433c1d73b97d4d4e512de8 (diff)
downloadop-kernel-dev-de474f9b9724c683789bda823c1a80d703738a45.zip
op-kernel-dev-de474f9b9724c683789bda823c1a80d703738a45.tar.gz
Merge tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig
ARM: Keystone config support for 4.11 - Enable Reset controller and on chip MSM RAM support. * tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER ARM: configs: keystone: Enable Generic on-chip SRAM driver Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/keystone_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index 78cd2f1..1331f6d 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -126,6 +126,7 @@ CONFIG_MTD_NAND_DAVINCI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
+CONFIG_SRAM=y
CONFIG_EEPROM_AT24=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
OpenPOWER on IntegriCloud