summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-09-12 18:26:40 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-09-12 18:26:40 +0100
commitf7b2debcf93630f8e5537f9b132528bd3cef15ea (patch)
treeb77988cc166d9227e80feddae67bd56f0e74e040 /kernel-s390x.config
parente19dd18c383ac8a604b14cb66940b901562f082e (diff)
downloadkernel-f7b2debcf93630f8e5537f9b132528bd3cef15ea.tar.gz
kernel-f7b2debcf93630f8e5537f9b132528bd3cef15ea.tar.xz
kernel-f7b2debcf93630f8e5537f9b132528bd3cef15ea.zip
Enable Physlink/SFP functionality, minor cleanups, Tegra DRM FTB fix
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c94ce63b6..0f1c7b0f9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -614,6 +614,7 @@ CONFIG_CCW=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_CEPH_FSCACHE=y
CONFIG_CEPH_FS=m
@@ -2533,6 +2534,7 @@ CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_DEVICE=m
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
@@ -3568,6 +3570,7 @@ CONFIG_PFAULT=y
# CONFIG_PHONET is not set
# CONFIG_PHY_CPCAP_USB is not set
CONFIG_PHYLIB=m
+CONFIG_PHYLINK=m
CONFIG_PHY_MVEBU_CP110_COMPHY=m
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4371,7 +4374,7 @@ CONFIG_SERIO_ALTERA_PS2=m
# CONFIG_SERIO_APBPS2 is not set
CONFIG_SERIO_ARC_PS2=m
# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
CONFIG_SERIO_I8042=y
# CONFIG_SERIO is not set
CONFIG_SERIO_LIBPS2=m
@@ -4384,6 +4387,7 @@ CONFIG_SERIO_SERPORT=m
CONFIG_SFC_FALCON=m
CONFIG_SFC_FALCON_MTD=y
# CONFIG_SFC is not set
+CONFIG_SFP=m
# CONFIG_SGI_IOC4 is not set
# CONFIG_SGI_PARTITION is not set
CONFIG_SHARED_KERNEL=y