summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-11-07 13:41:50 +0000
committerPeter Robinson <pbrobinson@gmail.com>2018-11-07 13:41:50 +0000
commit9feaafee26b39ac87ff8defe623b886641201ac4 (patch)
tree089c6e36fd54eb8bd5612f2aeb5e893287ee1a4d /kernel-s390x.config
parent33864ba38789c48f39794434bf995d0887e23b63 (diff)
downloadkernel-9feaafee26b39ac87ff8defe623b886641201ac4.tar.gz
kernel-9feaafee26b39ac87ff8defe623b886641201ac4.tar.xz
kernel-9feaafee26b39ac87ff8defe623b886641201ac4.zip
Initial Arm config updates for 4.20
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config12
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c903b44cf..8f55fddac 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -210,7 +210,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_W90X900 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
# CONFIG_AS3935 is not set
# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -901,7 +900,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
# CONFIG_CRYPTO_DEV_SP_CCP is not set
CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DH=y
@@ -2556,13 +2555,11 @@ CONFIG_LATENCYTOP=y
# CONFIG_LCD_ILI922X is not set
# CONFIG_LCD_ILI9320 is not set
# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
# CONFIG_LCD_LMS283GF05 is not set
# CONFIG_LCD_LMS501KF03 is not set
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_OTM3225A is not set
# CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_S6E63M0 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
CONFIG_LCS=m
@@ -4064,7 +4061,6 @@ CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
# CONFIG_QCOM_RPMH is not set
# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
CONFIG_QDIO=m
@@ -5579,7 +5575,7 @@ CONFIG_TR=y
# CONFIG_TS4800_IRQ is not set
# CONFIG_TS4800_WATCHDOG is not set
# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
# CONFIG_TSL2x7x is not set
# CONFIG_TSL4531 is not set
# CONFIG_TSYS01 is not set
@@ -5692,7 +5688,6 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6103,7 +6098,6 @@ CONFIG_VIDEO_SR030PC30=m
CONFIG_VIDEO_STK1160_AC97=y
CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
CONFIG_VIDEO_TM6000=m
@@ -6139,7 +6133,7 @@ CONFIG_VIRTIO_VSOCKETS=m
CONFIG_VIRTIO=y
CONFIG_VIRTUALIZATION=y
CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
CONFIG_VL6180=m
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q=m