disable CONFIG_USB_SUPPORT in generic config for 2.6.25 & 2.6.26 and enable it on...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12690 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index bc07fbb2fcc510932f36b480ae92ff747d153756..b00b4cd39908fe804d56a8519f03c07413cd281a 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.26
+++ b/target/linux/adm5120/router_be/config-2.6.26
@@ -271,6 +271,7 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_ALLOW_V4L1 is not set

diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26
index 81d3c39509bfc1d741568efd409d9fcfd2239403..17042d78a0c44c844174b6cf48a97d81688e8d78 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.26
+++ b/target/linux/adm5120/router_le/config-2.6.26
@@ -309,6 +309,7 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set

diff --git a/target/linux/ar7/config-2.6.26 b/target/linux/ar7/config-2.6.26
index 1660d765ddad7ec9de57f91dc51dcb03a616dbc8..b4324320b98cad31bf2e9a1054324b7c47aa701e 100644 (file)
--- a/target/linux/ar7/config-2.6.26
+++ b/target/linux/ar7/config-2.6.26
@@ -206,7 +206,6 @@ CONFIG_TICK_ONESHOT=y
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_VIDEO_MEDIA is not set

diff --git a/target/linux/ar71xx/config-2.6.26 b/target/linux/ar71xx/config-2.6.26
index 0d7918fddb24cf83d8f1e8fda131851c1b00298a..b735675cc5c52d1f377c656030f09768c59da009 100644 (file)
--- a/target/linux/ar71xx/config-2.6.26
+++ b/target/linux/ar71xx/config-2.6.26
@@ -239,6 +239,7 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_OHCI_AR71XX=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_VGASTATE is not set

diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index c4dbecf285b1c899d5793d140e7ff1c7c7c6af17..282e87c9096a1bc6c9ff76a76449e18fb13ddba0 100644 (file)
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -299,6 +299,7 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UEAGLEATM is not set
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set

diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26
index d2560550dc434e5a6baa481bc0bd9dfe5dfd2fb3..30d04061c3b35ea0fc000a998499fe8ee869833f 100644 (file)
--- a/target/linux/atheros/config-2.6.26
+++ b/target/linux/atheros/config-2.6.26
@@ -230,6 +230,7 @@ CONFIG_USB=m
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_ISIGHTFW is not set
 CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 CONFIG_USB_WDM=m
 # CONFIG_VGASTATE is not set

diff --git a/target/linux/au1000/config-2.6.25 b/target/linux/au1000/config-2.6.25
index 175baabc6017e7597d3ea8b59991a9f1426fe454..f16f0948ab5408f40f2ea889330fd8e9fa102e86 100644 (file)
--- a/target/linux/au1000/config-2.6.25
+++ b/target/linux/au1000/config-2.6.25
@@ -263,6 +263,7 @@ CONFIG_TICK_ONESHOT=y
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set

diff --git a/target/linux/avr32/config-default b/target/linux/avr32/config-default
index 8a0692a60e3d6f13880e673484f5febdda0c2d7c..7171119fc81f1cd9375892e8a0218f6c59a52014 100644 (file)
--- a/target/linux/avr32/config-default
+++ b/target/linux/avr32/config-default
@@ -190,6 +190,7 @@ CONFIG_TICK_ONESHOT=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_ZONE_DMA_FLAG=0

diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25
index 6ddcd225b626c48aa9ab8307809b33944cbbb37f..544e7b5213dd1ccb5bd564d9dd830e8696f0d897 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.25
+++ b/target/linux/brcm47xx/config-2.6.25
@@ -262,6 +262,7 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set

diff --git a/target/linux/brcm63xx/config-2.6.25 b/target/linux/brcm63xx/config-2.6.25
index 4ca5b306d3ccafe9381611713cd3f9afb4ad4aca..c3efcb87417d10fa4f536e05b008edcebc5ac800 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.25
+++ b/target/linux/brcm63xx/config-2.6.25
@@ -306,6 +306,7 @@ CONFIG_USB=m
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL_CH341 is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set

diff --git a/target/linux/etrax/config-default b/target/linux/etrax/config-default
index e4bdc3219a48b2722012c5d82407ef00ad06b619..f869b8ae31e0eb8f78fe4c996f4068f2d7dc0a93 100644 (file)
--- a/target/linux/etrax/config-default
+++ b/target/linux/etrax/config-default
@@ -252,5 +252,6 @@ CONFIG_USB=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_VFAT_FS=y
 # CONFIG_VLAN_8021Q is not set

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 7476c06cc8d381ebfa183a6117b6b5a485a86ee6..c93dcd365827ece9de5c7a79575b2ec090058207 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -1721,7 +1721,7 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_STV680 is not set
-CONFIG_USB_SUPPORT=y
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 7022a2f7d9a1296c2527966fdef7eea121a3d5c7..2cbe2f9a1886282da56e726b95d9f9794dd32c11 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -1764,7 +1764,7 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_STV680 is not set
-CONFIG_USB_SUPPORT=y
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set

diff --git a/target/linux/ifxmips/config-2.6.26 b/target/linux/ifxmips/config-2.6.26
index bfb8535b5d76d522be6b18a02ad7d744d570be18..77cc5ceeb05bddcf3e8b210cb3cab9e9e40f02d7 100644 (file)
--- a/target/linux/ifxmips/config-2.6.26
+++ b/target/linux/ifxmips/config-2.6.26
@@ -226,6 +226,7 @@ CONFIG_USB=m
 # CONFIG_USB_DWC_HCD is not set
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_ISIGHTFW is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index e4ecfe1af1f993c221b9644d21238eb6a8b8c1d1..7e5e312b0446c9f6810c9dc2e8bf63669a23ae47 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -345,6 +345,7 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_USBNET is not set
 CONFIG_VECTORS_BASE=0xffff0000

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 15c151796e44f91c143f42e76385092800732eb6..1ea21c97357daca838d68919d9f1d72a96482977 100644 (file)
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -381,6 +381,7 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_SERIAL_MOTOROLA is not set
 # CONFIG_USB_SERIAL_SPCP8X5 is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_WDM is not set
 CONFIG_VECTORS_BASE=0xffff0000

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 1b4ab8077bb72b8ec39248721e4777eace927beb..9221b42b437e110a431a7dcc937a426ab1af4be9 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -360,6 +360,7 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_WDM is not set

diff --git a/target/linux/rdc/config-2.6.25 b/target/linux/rdc/config-2.6.25
index afd2c2573856cf5a6feaf35d2c88232838cd7e51..1dc8ed27064d1db0ec8d8f92c6eee54200cb1bc1 100644 (file)
--- a/target/linux/rdc/config-2.6.25
+++ b/target/linux/rdc/config-2.6.25
@@ -318,6 +318,7 @@ CONFIG_USB_PWC=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_OTI6858 is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VGASTATE is not set

diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default
index 6c008fa60d62470379eb6bfd4c7b2b204c2eab44..e431b86c0dd779dad4b44661ef3ec936f9a42919 100644 (file)
--- a/target/linux/sibyte/config-default
+++ b/target/linux/sibyte/config-default
@@ -268,7 +268,6 @@ CONFIG_TICK_ONESHOT=y
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
-# CONFIG_USB_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_VIDEO_MEDIA is not set

diff --git a/target/linux/x86/config-2.6.25 b/target/linux/x86/config-2.6.25
index 0f000eb4eba47959d96a65a7f003c15af410db89..c828144713acff8d993b2da85e2a5841a9bfe14f 100644 (file)
--- a/target/linux/x86/config-2.6.25
+++ b/target/linux/x86/config-2.6.25
@@ -50,6 +50,7 @@ CONFIG_BLK_DEV_IDEDMA_SFF=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_QD65XX is not set
 CONFIG_BLK_DEV_SC1200=y
+# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
@@ -422,6 +423,7 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL_OTI6858 is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USER_NS is not set
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set