Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2018-06-06 10:14:52 +0200
committerOliver Neukum <oneukum@suse.com>2018-06-06 12:04:01 +0200
commit32bc34145946993d16ec74e66ecff67ff43c89b8 (patch)
tree3878300a059ead2fa06e90f36fcea0d288d60323
parentb1891a06536941e34f05f2595e4dfbd9568ba1e5 (diff)
- Update config files and supported.conf: Resurrect WUSB
This reverts FATE#323423 dropping support for WUSB. It would be a regression in SLE12.
-rw-r--r--config/arm64/default3
-rw-r--r--config/ppc64le/default9
-rw-r--r--config/x86_64/debug1
-rw-r--r--config/x86_64/default9
-rw-r--r--supported.conf3
5 files changed, 16 insertions, 9 deletions
diff --git a/config/arm64/default b/config/arm64/default
index c883759a44..527b7c6316 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -5611,7 +5611,8 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_MON=m
-# CONFIG_USB_WUSB_CBAF is not set
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
#
# USB Host Controller Drivers
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 56a25275a0..2a6cbdc031 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -3812,8 +3812,9 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_MON=m
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
#
# USB Host Controller Drivers
@@ -3843,8 +3844,8 @@ CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_U132_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
# CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_HCD_TEST_MODE is not set
diff --git a/config/x86_64/debug b/config/x86_64/debug
index a2c9550c2c..83295188e4 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -77,6 +77,7 @@ CONFIG_TTY_PRINTK=y
CONFIG_UFS_DEBUG=y
CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_WUSB_CBAF_DEBUG=y
CONFIG_XFS_DEBUG=y
CONFIG_MODULES=y
CONFIG_MODULE_SIG=y
diff --git a/config/x86_64/default b/config/x86_64/default
index b1083bd522..6cf944fdc9 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -5566,8 +5566,9 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_MON=m
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
#
# USB Host Controller Drivers
@@ -5593,8 +5594,8 @@ CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_U132_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
# CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_HCD_TEST_MODE is not set
diff --git a/supported.conf b/supported.conf
index e2bd6cfaf6..e31bf9b33d 100644
--- a/supported.conf
+++ b/supported.conf
@@ -2178,6 +2178,9 @@
+base drivers/usb/storage/ums-sddr55
+base drivers/usb/storage/ums-usbat
+base drivers/usb/storage/usb-storage # USB Mass Storage driver for Linux
+- drivers/usb/wusbcore/wusb-cbaf
+- drivers/usb/wusbcore/wusb-wa
+- drivers/usb/wusbcore/wusbcore
drivers/vfio/mdev/mdev
drivers/vfio/pci/vfio-pci
drivers/vfio/vfio