diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
| commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
| tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /sound/usb | |
| parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
| parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) | |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index c4dcbadd83a..44d6d2ec964 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig | |||
| @@ -22,8 +22,7 @@ config SND_USB_AUDIO | |||
| 22 | will be called snd-usb-audio. | 22 | will be called snd-usb-audio. |
| 23 | 23 | ||
| 24 | config SND_USB_UA101 | 24 | config SND_USB_UA101 |
| 25 | tristate "Edirol UA-101/UA-1000 driver (EXPERIMENTAL)" | 25 | tristate "Edirol UA-101/UA-1000 driver" |
| 26 | depends on EXPERIMENTAL | ||
| 27 | select SND_PCM | 26 | select SND_PCM |
| 28 | select SND_RAWMIDI | 27 | select SND_RAWMIDI |
| 29 | help | 28 | help |