diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-09 07:47:33 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-09 07:47:33 +0100 |
commit | fcea6100f4f3ee958360e2fedcbb79586df7a051 (patch) | |
tree | 01d293150ff91e9beb3088f360f849c5935b4cbe /kernel-s390x.config | |
parent | e676ec22ee15ea1cdb0a1ad1f6a859e12e5b3a93 (diff) | |
parent | f8bdcf89c2e51095ac60ec50e0fa9bdf5b605a20 (diff) | |
download | kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc28.tar.gz kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc28.tar.xz kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc28.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index b28666601..8ca6b2bfa 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1057,9 +1057,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m -CONFIG_DRM_I2C_ADV7511_AUDIO=y -CONFIG_DRM_I2C_ADV7511_CEC=y -CONFIG_DRM_I2C_ADV7511=m +# CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m @@ -2114,7 +2112,6 @@ CONFIG_IPVTAP=m # CONFIG_IPW2200_DEBUG is not set # CONFIG_IPW2200 is not set CONFIG_IPWIRELESS=m -# CONFIG_IPX_INTERN is not set # CONFIG_IPX is not set # CONFIG_IRDA is not set CONFIG_IR_ENE=m @@ -2925,15 +2922,7 @@ CONFIG_NATIONAL_PHY=m CONFIG_NATSEMI=m # CONFIG_NAU7802 is not set # CONFIG_NBPFAXI_DMA is not set -CONFIG_NCPFS_EXTRAS=y -CONFIG_NCPFS_IOCTL_LOCKING=y # CONFIG_NCP_FS is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_STRONG=y # CONFIG_ND_BLK is not set CONFIG_NE2K_PCI=m # CONFIG_NET_9P_DEBUG is not set |