* Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO

as alsa snd-usb-audio still isn't quite there.
    I expect this to be re-disabled at some stage,
    possibly soon if it proves to be a source of bugs.
    (closes: #340388)

svn path=/dists/trunk/linux-2.6/; revision=4931
This commit is contained in:
Simon Horman 2005-11-30 07:44:13 +00:00
parent b86c95df2e
commit 5ea66f21f4
11 changed files with 8 additions and 11 deletions

View File

@ -1459,7 +1459,6 @@ CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

View File

@ -1390,7 +1390,6 @@ CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

View File

@ -1133,7 +1133,6 @@ CONFIG_USB_ISP116X_HCD=m
#
# USB Device Class drivers
#
# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m

3
debian/arch/config vendored
View File

@ -614,7 +614,6 @@ CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_NET_CDC_SUBSET=m
CONFIG_USB_NET_NET1080=m
CONFIG_9P_FS=m
# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
CONFIG_FUSION_SAS=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_INET_DCCP_DIAG=m
@ -737,3 +736,5 @@ CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_PACKET_MMAP=y
CONFIG_MKISS=m
# CONFIG_USB_MIDI is not set
CONFIG_OBSOLETE_OSS_USB_DRIVER=y

View File

@ -814,7 +814,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set
CONFIG_USB_STORAGE=m

View File

@ -1644,7 +1644,6 @@ CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

View File

@ -1131,7 +1131,6 @@ CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

View File

@ -1022,7 +1022,6 @@ CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

View File

@ -330,7 +330,6 @@ CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

View File

@ -334,7 +334,6 @@ CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m

7
debian/changelog vendored
View File

@ -15,8 +15,13 @@ linux-2.6 (2.6.14+2.6.15-rc2-0experimental.1) UNRELEASED; urgency=low
[ Simon Horman ]
* Add recommends libc6-i686 to 686 and k7 image packages
(closes: #278729)
* Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
as alsa snd-usb-audio still isn't quite there.
I expect this to be re-disabled at some stage,
possibly soon if it proves to be a source of bugs.
(closes: #340388)
-- Simon Horman <horms@verge.net.au> Wed, 30 Nov 2005 16:12:35 +0900
-- Simon Horman <horms@verge.net.au> Wed, 30 Nov 2005 16:42:57 +0900
linux-2.6 (2.6.14-3) unstable; urgency=low