summaryrefslogtreecommitdiffstats
path: root/kernel-i686.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-i686.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-i686.config')
-rw-r--r--kernel-i686.config11
1 files changed, 2 insertions, 9 deletions
diff --git a/kernel-i686.config b/kernel-i686.config
index 3680408d9..32e2c042d 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1404,8 +1404,8 @@ CONFIG_DVB_USB_ZD1301=m
CONFIG_DW_DMAC_CORE=y
CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=y
-# 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
@@ -3953,15 +3953,12 @@ CONFIG_NOZOMI=m
CONFIG_NR_CPUS=32
CONFIG_NS83820=m
CONFIG_NSC_GPIO=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 is not set
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
@@ -3990,7 +3987,6 @@ CONFIG_OF_FPGA_REGION=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
CONFIG_OLPC_XO15_SCI=y
-# CONFIG_OLPC_XO175 is not set
CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
@@ -4190,7 +4186,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_PHYSICAL_ALIGN=0x400000
@@ -4208,7 +4203,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_GEMINILAKE=m
CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_IMX8MN is not set
# CONFIG_PINCTRL_IPQ8074 is not set
CONFIG_PINCTRL_LEWISBURG=m
# CONFIG_PINCTRL_MCP23S08 is not set
@@ -6432,7 +6426,6 @@ CONFIG_VIDEO_IPU3_CIO2=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