Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig

olofj · olofj · commit 43018fc5ac1b · 2015-02-06T00:27:34.000-08:00
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 &lt;olof@lixom.net&gt;
diff --git 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
