UBUNTU: rebase to v4.10-rc2

[mirror_ubuntu-zesty-kernel.git] / debian.master / config / powerpc / config.flavour.powerpc-e500mc

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index 80f04ab8b7e98e4eaca6875d68e2ddcd8328ba93..9a706652c841cf944ce69962cddd78cecd31c86c 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -13,6 +13,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_BATMAN_ADV_BATMAN_V=y
 # CONFIG_CRASH_DUMP is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
 CONFIG_DEFAULT_UIMAGE=y
@@ -33,12 +34,11 @@ CONFIG_HAS_RAPIDIO=y
 CONFIG_HIBERNATION=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_I2C_SLAVE=y
 CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_IMA=y
 CONFIG_IWLWIFI_PCIE_RTPM=y
 CONFIG_KERNEL_START=0xc0000000
-CONFIG_KEXEC=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MEDIA_CONTROLLER_DVB=y
 # CONFIG_MMIO_NVRAM is not set
@@ -78,5 +78,4 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_TEST_BITMAP=m
 CONFIG_TEST_PRINTF=m
-CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WQ_WATCHDOG=y