summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm6410
-rw-r--r--config-armv7-generic2
-rw-r--r--config-powerpc64-generic3
-rw-r--r--kernel.spec3
4 files changed, 10 insertions, 8 deletions
diff --git a/config-arm64 b/config-arm64
index cde22ee36..5578f2bb5 100644
--- a/config-arm64
+++ b/config-arm64
@@ -108,9 +108,9 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
# APM Xgene
CONFIG_POWER_RESET_XGENE=y
CONFIG_COMMON_CLK_XGENE=y
-CONFIG_AHCI_XGENE=y
-CONFIG_PHY_XGENE=y
-CONFIG_NET_XGENE=y
+CONFIG_AHCI_XGENE=m
+CONFIG_PHY_XGENE=m
+CONFIG_NET_XGENE=m
CONFIG_RTC_DRV_XGENE=m
CONFIG_HW_RANDOM_XGENE=m
CONFIG_GPIO_XGENE=y
@@ -138,8 +138,8 @@ CONFIG_I2C_XGENE_SLIMPRO=m
# AMD Seattle
CONFIG_NET_SB1000=y
-CONFIG_AMD_XGBE=m
-CONFIG_AMD_XGBE_PHY=m
+# CONFIG_AMD_XGBE is not set
+# CONFIG_AMD_XGBE_PHY is not set
# CONFIG_AMD_XGBE_DCB is not set
# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
CONFIG_PINCTRL_AMD=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 1c64a1a87..1b7807153 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -457,7 +457,7 @@ CONFIG_DRM_PANEL_LG_LG4573=m
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
CONFIG_DRM_DW_HDMI=m
-# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
# regmap
CONFIG_REGMAP_SPI=m
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index 5b1040d82..30b7455a9 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -74,14 +74,13 @@ CONFIG_PSERIES_CPUIDLE=y
CONFIG_HW_RANDOM_PSERIES=m
CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
CONFIG_CRYPTO_DEV_NX_COMPRESS=m
CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m
CONFIG_CRYPTO_DEV_VMX=y
-# CONFIG_CRYPTO_DEV_VMX_ENCRYPT is not set
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
CONFIG_XZ_DEC_POWERPC=y
diff --git a/kernel.spec b/kernel.spec
index be1d43190..d8eaa4456 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2043,6 +2043,9 @@ fi
#
#
%changelog
+* Sun Jan 17 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor updates to aarch64/ARMv7/PowerPC
+
* Fri Jan 15 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git4.1
- Linux v4.4-5966-g7d1fc01