summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-02-06 09:27:34 +0100
committerOlof Johansson <olof@lixom.net>2015-02-06 09:27:34 +0100
commit43018fc5ac1b12d5fbb8df90cea2778607f0cf8c (patch)
tree6f95efff5c3349c9bda49e3768f246153ed4682c /arch/arm
parentMerge tag 'renesas-defconfig-fixes-for-v3.20' of git://git.kernel.org/pub/scm... (diff)
parentARM: config: add DEVTMPFS option by default to keystone config (diff)
downloadlinux-43018fc5ac1b12d5fbb8df90cea2778607f0cf8c.tar.xz
linux-43018fc5ac1b12d5fbb8df90cea2778607f0cf8c.zip
Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig
Merge "ARM: Keystone soc config updates for 3.20" from Santosh Shilimkar: Keystone DEVTMPFS config update for 3.20 * tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: config: add DEVTMPFS option by default to keystone config Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-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 a2067cbfe173..f8a1c8f2c7c4 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -201,3 +201,4 @@ CONFIG_KEYSTONE_IRQ=y
CONFIG_GPIO_SYSCON=y
CONFIG_TI_DAVINCI_MDIO=y
CONFIG_MARVELL_PHY=y
+CONFIG_DEVTMPFS=y