From 788c1e4275f88ca1c78ef44e0802d7375aa7c839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Wawrzy=C5=84ski?= Date: Wed, 8 Aug 2018 11:34:09 +0200 Subject: [PATCH 1/2] add usb_storage and uas drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adam Wawrzyński --- configs/config-4.14.50 | 21 ++++++++++++++++++++- configs/config-4.15.18 | 21 ++++++++++++++++++++- configs/config-4.16.16 | 17 ++++++++++++++++- 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/configs/config-4.14.50 b/configs/config-4.14.50 index 98cb5175..a8cf535f 100644 --- a/configs/config-4.14.50 +++ b/configs/config-4.14.50 @@ -3175,7 +3175,11 @@ CONFIG_USB_EHCI_PCI=m CONFIG_USB_ACM=m # CONFIG_USB_PRINTER is not set CONFIG_USB_WDM=m +<<<<<<< Updated upstream CONFIG_USB_TMC=m +======= +# CONFIG_USB_TMC is not set +>>>>>>> Stashed changes # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may @@ -3184,7 +3188,22 @@ CONFIG_USB_TMC=m # # also be needed; see USB_STORAGE Help for more info # -# CONFIG_USB_STORAGE is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_STORAGE_ENE_UB6250 is not set +CONFIG_USB_UAS=m # # USB Imaging devices diff --git a/configs/config-4.15.18 b/configs/config-4.15.18 index cae1b337..d11cb61c 100644 --- a/configs/config-4.15.18 +++ b/configs/config-4.15.18 @@ -3201,7 +3201,11 @@ CONFIG_USB_EHCI_PCI=m CONFIG_USB_ACM=m # CONFIG_USB_PRINTER is not set CONFIG_USB_WDM=m +<<<<<<< Updated upstream CONFIG_USB_TMC=m +======= +# CONFIG_USB_TMC is not set +>>>>>>> Stashed changes # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may @@ -3210,7 +3214,22 @@ CONFIG_USB_TMC=m # # also be needed; see USB_STORAGE Help for more info # -# CONFIG_USB_STORAGE is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_STORAGE_ENE_UB6250 is not set +CONFIG_USB_UAS=m # # USB Imaging devices diff --git a/configs/config-4.16.16 b/configs/config-4.16.16 index f415f547..3e84af45 100644 --- a/configs/config-4.16.16 +++ b/configs/config-4.16.16 @@ -3224,7 +3224,22 @@ CONFIG_USB_WDM=m # # also be needed; see USB_STORAGE Help for more info # -# CONFIG_USB_STORAGE is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_STORAGE_ENE_UB6250 is not set +CONFIG_USB_UAS=m # # USB Imaging devices From d68531ec6551a43e78dde87dc1b7d3ecb4f8d22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Wawrzy=C5=84ski?= Date: Thu, 9 Aug 2018 11:26:19 +0200 Subject: [PATCH 2/2] fix trash from stash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adam Wawrzyński --- configs/config-4.14.50 | 5 ----- configs/config-4.15.18 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/configs/config-4.14.50 b/configs/config-4.14.50 index a8cf535f..2c1dcff0 100644 --- a/configs/config-4.14.50 +++ b/configs/config-4.14.50 @@ -3175,11 +3175,6 @@ CONFIG_USB_EHCI_PCI=m CONFIG_USB_ACM=m # CONFIG_USB_PRINTER is not set CONFIG_USB_WDM=m -<<<<<<< Updated upstream -CONFIG_USB_TMC=m -======= -# CONFIG_USB_TMC is not set ->>>>>>> Stashed changes # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may diff --git a/configs/config-4.15.18 b/configs/config-4.15.18 index d11cb61c..7b8a0564 100644 --- a/configs/config-4.15.18 +++ b/configs/config-4.15.18 @@ -3201,11 +3201,6 @@ CONFIG_USB_EHCI_PCI=m CONFIG_USB_ACM=m # CONFIG_USB_PRINTER is not set CONFIG_USB_WDM=m -<<<<<<< Updated upstream -CONFIG_USB_TMC=m -======= -# CONFIG_USB_TMC is not set ->>>>>>> Stashed changes # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may