Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9628416a authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: remove OBSOLETE_OSS_USB_DRIVER drivers 



This patch removes the obsolete USB_MIDI and USB_AUDIO drivers.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 29da7937

drivers/usb/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ obj-$(CONFIG_USB_SL811_HCD) += host/ 
obj-$(CONFIG_ETRAX_USB_HOST)	+= host/



obj-$(CONFIG_USB_ACM)		+= class/

obj-$(CONFIG_USB_AUDIO)		+= class/

obj-$(CONFIG_USB_MIDI)		+= class/

obj-$(CONFIG_USB_PRINTER)	+= class/



obj-$(CONFIG_USB_STORAGE)	+= storage/

drivers/usb/class/Kconfig

+0 −47
Original line number Diff line number Diff line
@@ -4,53 +4,6 @@ 
comment "USB Device Class drivers"

	depends on USB



config OBSOLETE_OSS_USB_DRIVER

	bool "Obsolete OSS USB drivers"

	depends on USB && SOUND

	help

	  This option enables support for the obsolete USB Audio and Midi

	  drivers that are scheduled for removal in the near future since

	  there are ALSA drivers for the same hardware.



	  Please contact Adrian Bunk <bunk@stusta.de> if you had to

	  say Y here because of missing support in the ALSA drivers.



	  If unsure, say N.



config USB_AUDIO

	tristate "USB Audio support"

	depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER

	help

	  Say Y here if you want to connect USB audio equipment such as

	  speakers to your computer's USB port. You only need this if you use

	  the OSS sound driver; ALSA has its own option for usb audio support.



	  To compile this driver as a module, choose M here: the

	  module will be called audio.



config USB_MIDI

	tristate "USB MIDI support"

	depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER

	---help---

	  Say Y here if you want to connect a USB MIDI device to your

	  computer's USB port.  You only need this if you use the OSS

	  sound system; USB MIDI devices are supported by ALSA's USB

	  audio driver. This driver is for devices that comply with

	  'Universal Serial Bus Device Class Definition for MIDI Device'.



	  The following devices are known to work:

	  * Steinberg USB2MIDI

	  * Roland MPU64

	  * Roland PC-300

	  * Roland SC8850

	  * Roland UM-1

	  * Roland UM-2

	  * Roland UA-100

	  * Yamaha MU1000



	  To compile this driver as a module, choose M here: the

	  module will be called usb-midi.



config USB_ACM

	tristate "USB Modem (CDC ACM) support"

	depends on USB

drivers/usb/class/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -4,6 +4,4 @@ 
#



obj-$(CONFIG_USB_ACM)		+= cdc-acm.o

obj-$(CONFIG_USB_AUDIO)		+= audio.o

obj-$(CONFIG_USB_MIDI)		+= usb-midi.o

obj-$(CONFIG_USB_PRINTER)	+= usblp.o