summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-07-06 16:34:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-07-06 16:34:35 -0400
commit088a50c52e6f720fdbd321871fb3e30e241508c5 (patch)
tree1a71348d2e970f1d6f8a1f824935e54d64d00040 /config-s390x
parent55b5c15b8f0c65f111c9fb61b839024d0502798c (diff)
downloadkernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.gz
kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.xz
kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.zip
Linux v4.2-rc1
- Disable debug options. - Add patch to fix perf build
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x
index ae529e443..f58e4d8b4 100644
--- a/config-s390x
+++ b/config-s390x
@@ -293,6 +293,8 @@ CONFIG_HOTPLUG_PCI_S390=y
# CONFIG_FMC is not set
+# CONFIG_OF is not set
+
CONFIG_MLX4_EN=m
CONFIG_MLX4_EN_DCB=y
CONFIG_MLX4_EN_VXLAN=y