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 bc07fbb..b00b4cd 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_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
 # 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 81d3c39..17042d7 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_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
 # 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 1660d76..b432432 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_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
 # 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 0d7918f..b735675 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_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
 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 c4dbecf..282e87c 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_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
 # 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 d256055..30d0406 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_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
 # 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 175baab..f16f094 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_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
 # 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 8a0692a..7171119 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_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
 # 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 6ddcd22..544e7b5 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_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
 # 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 4ca5b30..c3efcb8 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_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
 # 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 e4bdc32..f869b8a 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_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
 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 7476c06..c93dcd3 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_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
 # 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 7022a2f..2cbe2f9 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_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
 # 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 bfb8535..77cc5ce 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_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
 # 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 e4ecfe1..7e5e312 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_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
 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 15c1517..1ea21c9 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_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
 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 1b4ab80..9221b42 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_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
 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 afd2c25..1dc8ed2 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_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
 # 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 6c008fa..e431b86 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_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
 # 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 0f000eb..c828144 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_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
 # 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_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
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USER_NS is not set
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set