summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-07-22 00:42:57 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-07-22 00:42:57 +0100
commitcb88675efe2006563ccda3ab61d59cf1db71568d (patch)
treec2d9b156073b98c1389c5eed18d498dfd4c5f18b /kernel-s390x.config
parent364bffc7b72f390b2c7253e1ba611cc86be3bc4a (diff)
downloadkernel-cb88675efe2006563ccda3ab61d59cf1db71568d.tar.gz
kernel-cb88675efe2006563ccda3ab61d59cf1db71568d.tar.xz
kernel-cb88675efe2006563ccda3ab61d59cf1db71568d.zip
arm updates for 5.3 part 2
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config11
1 files changed, 2 insertions, 9 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index aa7093c6a..4f1d6f8e0 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1303,8 +1303,8 @@ CONFIG_DVB_USB_ZD1301=m
CONFIG_DW_DMAC_CORE=m
# CONFIG_DW_DMAC is not set
CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
# CONFIG_DW_WATCHDOG is not set
CONFIG_DYNAMIC_DEBUG=y
CONFIG_DYNAMIC_FTRACE=y
@@ -3638,10 +3638,8 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOZOMI is not set
CONFIG_NR_CPUS=64
CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
# CONFIG_NTB is not set
# CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
# CONFIG_NTFS_FS is not set
CONFIG_NULL_TTY=m
# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3649,7 +3647,6 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
@@ -3674,7 +3671,6 @@ CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OF_FPGA_REGION=m
# CONFIG_OF is not set
-# CONFIG_OLPC_XO175 is not set
# CONFIG_OMFS_FS is not set
CONFIG_OPENVSWITCH_GENEVE=m
CONFIG_OPENVSWITCH_GRE=m
@@ -3842,7 +3838,6 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_TUSB1210 is not set
@@ -3851,7 +3846,6 @@ CONFIG_PID_NS=y
# CONFIG_PINCONF is not set
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_IMX8MN is not set
# CONFIG_PINCTRL_IPQ8074 is not set
# CONFIG_PINCTRL is not set
# CONFIG_PINCTRL_MCP23S08 is not set
@@ -5973,7 +5967,6 @@ CONFIG_VIDEO_HEXIUM_ORION=m
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
CONFIG_VIDEO_IVTV=m
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_MXB=m
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set