Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-06-06 15:23:57 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2018-06-06 15:23:57 +0200
commitaf0efc68fbe4420d3bead9bdf93a0e9110f6f9de (patch)
tree2de366c5d1130ca30a516951e63c9eedc11b3408
parent1971457426ccfa95f938bb7f74c459c9b16d1030 (diff)
parentdc63b01b9d61593cdc63cc5c5ce920ccd3aa0077 (diff)
Merge remote-tracking branch 'origin/users/oneukum/SLE12-SP4/for-next' into SLE12-SP4rpm-4.12.14-94.27
Pull PCMCIA update from Oliver Neukum
-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