Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2018-06-06 15:09:50 +0200
committerOliver Neukum <oneukum@suse.com>2018-06-06 15:09:50 +0200
commitdc63b01b9d61593cdc63cc5c5ce920ccd3aa0077 (patch)
treeadfa677f6f7e2b5aa594fddfe67ec24e57f48ab5
parent825b8c5005e2c94a51ea19bcab728ac99e4ed149 (diff)
- Update config files and supported.conf: Resurrected PCMCIA
This reverts FATE#323267. It would be a regression in SLE12.
-rw-r--r--config/x86_64/default7
-rw-r--r--supported.conf3
2 files changed, 9 insertions, 1 deletions
diff --git a/config/x86_64/default b/config/x86_64/default
index 606f7405a8..3a5d763d46 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 e31bf9b33d..34634cec22 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