aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-23 14:56:33 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-23 14:56:33 +0100
commit85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch)
treef9eaa974b88b9db09dab9e5f6876e87d12543fe4 /sound
parent6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff)
parent306ff3e473a970f88680e8355c0900fcab0357e2 (diff)
downloadkernel_samsung_aries-85ae01b2da0ed606a2e8d840aadef90fd30220a1.zip
kernel_samsung_aries-85ae01b2da0ed606a2e8d840aadef90fd30220a1.tar.gz
kernel_samsung_aries-85ae01b2da0ed606a2e8d840aadef90fd30220a1.tar.bz2
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index c4dcbad..44d6d2e 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -22,8 +22,7 @@ config SND_USB_AUDIO
will be called snd-usb-audio.
config SND_USB_UA101
- tristate "Edirol UA-101/UA-1000 driver (EXPERIMENTAL)"
- depends on EXPERIMENTAL
+ tristate "Edirol UA-101/UA-1000 driver"
select SND_PCM
select SND_RAWMIDI
help