Merge branch 'x86/amd-iommu' into x86/urgent

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 3d9249632ae1..c76034672c18 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -146,6 +146,18 @@ config USB_STORAGE_KARMA
           on the resulting scsi device node returns the Karma to normal
           operation.
 
+config USB_STORAGE_SIERRA
+        bool "Sierra Wireless TRU-Install Feature Support"
+        depends on USB_STORAGE
+        help
+          Say Y here to include additional code to support Sierra Wireless
+          products with the TRU-Install feature (e.g., AC597E, AC881U).
+
+          This code switches the Sierra Wireless device from being in
+          Mass Storage mode to Modem mode. It also has the ability to
+          support host software upgrades should full Linux support be added
+          to TRU-Install.
+
 config USB_STORAGE_CYPRESS_ATACB
         bool "SAT emulation on Cypress USB/ATA Bridge with ATACB"
         depends on USB_STORAGE