* debian/changelog: Update.

* debian/config: Disable USB_GADGET.

svn path=/dists/trunk/linux-2.6/; revision=10880
This commit is contained in:
Bastian Blank 2008-03-14 21:57:08 +00:00
parent cbd9fca292
commit 34a92674a1
23 changed files with 2 additions and 311 deletions

2
debian/changelog vendored
View File

@ -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.

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

14
debian/config/config vendored
View File

@ -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

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##

View File

@ -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
##