summaryrefslogtreecommitdiffstats
path: root/config-arm64
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2014-11-11 09:38:12 -0500
committerKyle McMartin <kmcmarti@redhat.com>2014-11-11 09:38:12 -0500
commit81c4dc55f83517f99282c822fa0def3e308414b5 (patch)
tree2adfbd158485261e11d3fe42f1517d7d3b5a5790 /config-arm64
parent09115662e15ee83248e62465fead50be5ed85f79 (diff)
downloadkernel-81c4dc55f83517f99282c822fa0def3e308414b5.tar.gz
kernel-81c4dc55f83517f99282c822fa0def3e308414b5.tar.xz
kernel-81c4dc55f83517f99282c822fa0def3e308414b5.zip
Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4
Diffstat (limited to 'config-arm64')
-rw-r--r--config-arm646
1 files changed, 5 insertions, 1 deletions
diff --git a/config-arm64 b/config-arm64
index e4775a6cd..a0db86323 100644
--- a/config-arm64
+++ b/config-arm64
@@ -134,5 +134,9 @@ CONFIG_AMD_XGBE_PHY=m
# CONFIG_IMX_THERMAL is not set
-# temporary 2014-10-21
+# still? 2014-11-11
# CONFIG_BPF_JIT is not set
+
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y