diff --git a/debian/changelog b/debian/changelog index 64acef296..7c0748f10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,7 +72,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low * [powerpc] Use new wrapper install support. * [s390] Enable DM_MULTIPATH_EMC. * Enable AF_RXRPC and RXKAD. - * Disable R3964. + * Disable R3964, USB_GADGET. * [hppa] Enable several filesystems. * Make NLS modular. diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 7613fd793..d352d969b 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1191,31 +1191,6 @@ CONFIG_USB_PRINTER=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 5f39404ba..652fc609c 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1224,30 +1224,6 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index dfcef2b32..611e1cd8d 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -989,11 +989,6 @@ CONFIG_USB_DEBUG=y CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 3a00aa036..31b1150d5 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -997,11 +997,6 @@ CONFIG_USB_PRINTER=m CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 191727d48..c5a213512 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1404,19 +1404,7 @@ CONFIG_USB_DEVICE_CLASS=y ## ## file: drivers/usb/gadget/Kconfig ## -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -## choice: USB Peripheral Controller -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_FSL_USB2 is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_AT91 is not set -## end choice -## choice: USB Gadget Drivers -CONFIG_USB_MIDI_GADGET=m -# CONFIG_USB_G_PRINTER is not set -## end choice +# CONFIG_USB_GADGET is not set ## ## file: drivers/usb/host/Kconfig diff --git a/debian/config/hppa/config b/debian/config/hppa/config index fbe477b70..46705dd62 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -571,11 +571,6 @@ CONFIG_USB_DEBUG=y # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/i386/config b/debian/config/i386/config index 1a6b21e82..8f272ef72 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1468,30 +1468,6 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index b47162fe1..89a5fece4 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -832,11 +832,6 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 17fdc59a5..47e6fd8ca 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -179,11 +179,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/video/console/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index bf92f1d39..52707fc81 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1525,34 +1525,6 @@ CONFIG_USB_PRINTER=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 0c86eeb2b..e1c749378 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1782,34 +1782,6 @@ CONFIG_USB_PRINTER=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index b3a0e8178..2517183f3 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -503,11 +503,6 @@ CONFIG_SPI_BUTTERFLY=m # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/video/Kconfig ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index f78552f6e..59743bc78 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -591,11 +591,6 @@ CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/video/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 98ac8cdb4..e4931da4c 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -816,31 +816,6 @@ CONFIG_USB_ACM=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_USB_G_SERIAL=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 5f3aa37f7..a112c5eab 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -804,11 +804,6 @@ CONFIG_USB=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 76dcdaec4..1c72220b5 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1524,35 +1524,6 @@ CONFIG_USB_PRINTER=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 89549e6ea..c8b680102 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1781,35 +1781,6 @@ CONFIG_USB_PRINTER=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index d34d77c3e..4a5ef445e 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -750,11 +750,6 @@ CONFIG_USB_PRINTER=m # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 8c9ec5175..ab2565ea9 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -815,31 +815,6 @@ CONFIG_USB_ACM=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -CONFIG_USB_GADGET_DUALSPEED=y -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_USB_G_SERIAL=m -## end choice - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 110283e99..6910cb50f 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -803,11 +803,6 @@ CONFIG_USB=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 805429de5..c3b9c3410 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -870,11 +870,6 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_SUSPEND is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/usb/host/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index dbb85cb2a..05186a268 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -205,11 +205,6 @@ CONFIG_SERIAL_JSM=m ## # CONFIG_PHONE is not set -## -## file: drivers/usb/gadget/Kconfig -## -# CONFIG_USB_GADGET is not set - ## ## file: drivers/video/Kconfig ##