diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-02 05:27:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-02 05:27:46 -0500 |
| commit | 156366d31524dc6b88836f06dccb1be13dbef5f1 (patch) | |
| tree | 5ae1fee7169edd9bebace22394f0777af21fca63 /sound/usb/Kconfig | |
| parent | 7f9320d415fab5c05097c77eea7a77f2f6341f24 (diff) | |
| parent | 0a566ec25627bdd360f7294aa2e52f9d121233b4 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Conflicts:
sound/usb/usbaudio.c
Diffstat (limited to 'sound/usb/Kconfig')
| -rw-r--r-- | sound/usb/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index 8c2925814ce4..c570ae3e6d55 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig | |||
| @@ -22,13 +22,13 @@ 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 driver (EXPERIMENTAL)" | 25 | tristate "Edirol UA-101/UA-1000 driver (EXPERIMENTAL)" |
| 26 | depends on EXPERIMENTAL | 26 | depends on EXPERIMENTAL |
| 27 | select SND_PCM | 27 | select SND_PCM |
| 28 | select SND_RAWMIDI | 28 | select SND_RAWMIDI |
| 29 | help | 29 | help |
| 30 | Say Y here to include support for the Edirol UA-101 audio/MIDI | 30 | Say Y here to include support for the Edirol UA-101 and UA-1000 |
| 31 | interface. | 31 | audio/MIDI interfaces. |
| 32 | 32 | ||
| 33 | To compile this driver as a module, choose M here: the module | 33 | To compile this driver as a module, choose M here: the module |
| 34 | will be called snd-ua101. | 34 | will be called snd-ua101. |