summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv72
-rw-r--r--config-armv7-generic3
-rw-r--r--kernel.spec3
3 files changed, 6 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 7f76e3893..4e62e3a79 100644
--- a/config-armv7
+++ b/config-armv7
@@ -356,7 +356,7 @@ CONFIG_PHY_QCOM_APQ8064_SATA=m
CONFIG_PHY_QCOM_IPQ806X_SATA=m
CONFIG_USB_DWC3_QCOM=m
CONFIG_CRYPTO_DEV_QCE=m
-CONFIG_MSM_IOMMU=y
+# CONFIG_MSM_IOMMU is not set
CONFIG_DRM_MSM=m
CONFIG_DRM_MSM_FBDEV=y
CONFIG_USB_EHCI_MSM=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 74aa6fd0e..45704e28f 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -179,7 +179,7 @@ CONFIG_SATA_HIGHBANK=m
CONFIG_ARM_HIGHBANK_CPUFREQ=m
# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-# Allwinner
+# AllWinner
# CONFIG_MACH_SUN4I is not set
# CONFIG_MACH_SUN5I is not set
CONFIG_MACH_SUN6I=y
@@ -406,6 +406,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
CONFIG_DRM_PANEL_LD9040=m
CONFIG_DRM_PANEL_S6E8AA0=m
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_DW_HDMI=m
# regmap
CONFIG_REGMAP_SPI=m
diff --git a/kernel.spec b/kernel.spec
index 42d375804..16ca947db 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2210,6 +2210,9 @@ fi
#
#
%changelog
+* Tue Feb 24 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config update
+
* Mon Feb 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git0.1
- Add patch for HID i2c from Seth Forshee (rhbz 1188439)