disable CONFIG_USB_SUPPORT in generic config for 2.6.25 & 2.6.26 and enable it on targets where USB is supported

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

20 files changed, 19 insertions, 4 deletions

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index bc07fbb2fc..b00b4cd399 100644
--- 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 81d3c39509..17042d78a0 100644
--- 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 1660d765dd..b4324320b9 100644
--- 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 0d7918fddb..b735675cc5 100644
--- 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 c4dbecf285..282e87c909 100644
--- 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 d2560550dc..30d04061c3 100644
--- 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 175baabc60..f16f0948ab 100644
--- 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 8a0692a60e..7171119fc8 100644
--- 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 6ddcd225b6..544e7b5213 100644
--- 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 4ca5b306d3..c3efcb8741 100644
--- 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 e4bdc3219a..f869b8ae31 100644
--- 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 7476c06cc8..c93dcd3658 100644
--- 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 7022a2f7d9..2cbe2f9a18 100644
--- 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 bfb8535b5d..77cc5ceeb0 100644
--- 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 e4ecfe1af1..7e5e312b04 100644
--- 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 15c151796e..1ea21c9735 100644
--- 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 1b4ab8077b..9221b42b43 100644
--- 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 afd2c25738..1dc8ed2706 100644
--- 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 6c008fa60d..e431b86c0d 100644
--- 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 0f000eb4eb..c828144713 100644
--- 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