diff options
| author | Olof Johansson <olof@lixom.net> | 2015-02-06 00:27:34 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-02-06 00:27:34 -0800 |
| commit | 43018fc5ac1b12d5fbb8df90cea2778607f0cf8c (patch) | |
| tree | 6f95efff5c3349c9bda49e3768f246153ed4682c /arch/arm | |
| parent | 467f7ad9f47c9da23c4c6c874a01fc22fd43b50f (diff) | |
| parent | dbbfae701a940e6a416d4cdd4b918d95feb13e03 (diff) | |
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_defconfig | 1 |
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 |