summaryrefslogtreecommitdiff
path: root/arch/arm/configs/mackerel_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-04-14 18:44:42 +0400
committerIngo Molnar <mingo@kernel.org>2014-04-14 18:44:42 +0400
commit740c699a8d316c8bf8593f19e2ca47795e690622 (patch)
treea78886955770a477945c5d84e06b2e7678733b54 /arch/arm/configs/mackerel_defconfig
parente69af4657e7764d03ad555f0b583d9c4217bcefa (diff)
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
downloadlinux-740c699a8d316c8bf8593f19e2ca47795e690622.tar.xz
Merge tag 'v3.15-rc1' into perf/urgent
Pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/configs/mackerel_defconfig')
-rw-r--r--arch/arm/configs/mackerel_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
index a61e1653fc5e..57ececba2ae6 100644
--- a/arch/arm/configs/mackerel_defconfig
+++ b/arch/arm/configs/mackerel_defconfig
@@ -42,6 +42,8 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_MTD=y
CONFIG_MTD_CONCAT=y