Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-07-30 11:38:03 +0200
committerJean Delvare <jdelvare@suse.de>2014-07-30 11:38:03 +0200
commit9b5a5f02b5f1938c31cb6d2c6137ffaee20c22b6 (patch)
treeb86f5f11efa82572f7c27d38697d9413ebdb84bd
parenta2720a703b0a3eed0f5fcb76084ca20487cc62d1 (diff)
Revert "config: disable USB_UAS (bnc#888069)."
This reverts commit f509af67eb3a98665e0134eaadb91e93420d9e04. The uas driver works fine since kernel v3.15, the problem was that the module was blacklisted so it would not load when needed.
-rw-r--r--config/arm64/default2
-rw-r--r--config/armv6hl/default2
-rw-r--r--config/armv7hl/default2
-rw-r--r--config/armv7hl/lpae2
-rw-r--r--config/i386/debug2
-rw-r--r--config/i386/default2
-rw-r--r--config/i386/desktop2
-rw-r--r--config/i386/pae2
-rw-r--r--config/i386/vanilla6
-rw-r--r--config/i386/xen2
-rw-r--r--config/ppc/default2
-rw-r--r--config/ppc/vanilla6
-rw-r--r--config/ppc64/debug2
-rw-r--r--config/ppc64/default2
-rw-r--r--config/ppc64/vanilla9
-rw-r--r--config/ppc64le/debug2
-rw-r--r--config/ppc64le/default2
-rw-r--r--config/ppc64le/vanilla9
-rw-r--r--config/s390x/vanilla2
-rw-r--r--config/x86_64/debug2
-rw-r--r--config/x86_64/default2
-rw-r--r--config/x86_64/desktop2
-rw-r--r--config/x86_64/vanilla6
-rw-r--r--config/x86_64/xen2
24 files changed, 40 insertions, 34 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 94074f21d3..01efef0e30 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -3302,7 +3302,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/armv6hl/default b/config/armv6hl/default
index e388080545..e891b35d55 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -4271,7 +4271,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 2a52d675e7..75f7e39ce7 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -5455,7 +5455,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 67d41679f7..191de9b677 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -5121,7 +5121,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/i386/debug b/config/i386/debug
index d91b3ddab5..21396aea5e 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -5243,7 +5243,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/i386/default b/config/i386/default
index 6412ebe69f..f294287138 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -5281,7 +5281,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/i386/desktop b/config/i386/desktop
index 746a7514dd..5caf1cbb2d 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -5122,7 +5122,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/i386/pae b/config/i386/pae
index ef3e54d814..5eb5747a2b 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -5131,7 +5131,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/i386/vanilla b/config/i386/vanilla
index d957caab4c..4cd057d49c 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.16.0-rc7 Kernel Configuration
+# Linux/i386 3.16.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1774,8 +1774,8 @@ CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -5275,7 +5275,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/i386/xen b/config/i386/xen
index 8050916d8f..505c578ef6 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -4898,7 +4898,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc/default b/config/ppc/default
index 816f1ca5ab..8b8828c6fe 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -4388,7 +4388,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 254db57897..d65e23dfe0 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.16.0-rc7 Kernel Configuration
+# Linux/powerpc 3.16.0-rc6 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -1339,8 +1339,8 @@ CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_RESERVED_MEM=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -4382,7 +4382,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc64/debug b/config/ppc64/debug
index f5605929fa..b251d41284 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -4525,7 +4525,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc64/default b/config/ppc64/default
index 7d0fbb4995..12a5ef38fb 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -4515,7 +4515,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 9b20d740d0..95696a3f0e 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.16.0-rc7 Kernel Configuration
+# Linux/powerpc 3.16.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1460,8 +1460,8 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -1603,8 +1603,11 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
CONFIG_BLK_DEV_IT8172=m
# CONFIG_BLK_DEV_IT8213 is not set
@@ -4507,7 +4510,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc64le/debug b/config/ppc64le/debug
index d3cafaf2ee..c621a9b534 100644
--- a/config/ppc64le/debug
+++ b/config/ppc64le/debug
@@ -4500,7 +4500,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc64le/default b/config/ppc64le/default
index dd06a2f09b..56d2f1060c 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -4490,7 +4490,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index c7dd04fc37..a8ebaacb92 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.16.0-rc7 Kernel Configuration
+# Linux/powerpc 3.16.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1435,8 +1435,8 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -1578,8 +1578,11 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
CONFIG_BLK_DEV_IT8172=m
# CONFIG_BLK_DEV_IT8213 is not set
@@ -4482,7 +4485,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index e56861de52..755c7016d0 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.16.0-rc7 Kernel Configuration
+# Linux/s390 3.16.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index c357a046a6..67c3f957ba 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -5070,7 +5070,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/x86_64/default b/config/x86_64/default
index fed23fe501..c4360f83b5 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -5060,7 +5060,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 08fc4b830a..6ce06b34ce 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -5051,7 +5051,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index c10ebb0eca..ead4b9cbb4 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.16.0-rc7 Kernel Configuration
+# Linux/x86_64 3.16.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -1720,8 +1720,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
CONFIG_MTD_UBI_GLUEBI=m
# CONFIG_MTD_UBI_BLOCK is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -5056,7 +5056,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 92c5a91350..51a81dbccb 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -4833,7 +4833,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
#
# USB Imaging devices