From af0efc68fbe4420d3bead9bdf93a0e9110f6f9de Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn Date: Jun 06 2018 13:23:57 +0000 Subject: Merge remote-tracking branch 'origin/users/oneukum/SLE12-SP4/for-next' into SLE12-SP4 Pull PCMCIA update from Oliver Neukum --- diff --git a/config/x86_64/default b/config/x86_64/default index 606f740..3a5d763 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -898,7 +898,12 @@ CONFIG_CARDBUS=y # # PC-card bridges # -# CONFIG_YENTA is not set +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y CONFIG_RAPIDIO=m CONFIG_RAPIDIO_TSI721=m CONFIG_RAPIDIO_DISC_TIMEOUT=30 diff --git a/supported.conf b/supported.conf index e31bf9b..34634ce 100644 --- a/supported.conf +++ b/supported.conf @@ -1614,6 +1614,9 @@ drivers/pci/pcie/aer/aer_inject # fate #306815 drivers/pci/xen-pcifront +external drivers/pci/host/pci-hyperv +- drivers/pcmcia/pcmcia_core # Linux Kernel Card Services +- drivers/pcmcia/pcmcia_rsrc + drivers/pcmcia/yenta_socket - drivers/phy/allwinner/phy-sun4i-usb.ko - drivers/phy/allwinner/phy-sun9i-usb.ko - drivers/phy/amlogic/phy-meson8b-usb2.ko