diff options
| author | Daniel Mack <daniel@caiaq.de> | 2010-03-11 21:13:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-12 12:19:49 +0100 |
| commit | 7e847894039d7590321de306fca2b1ae58662f29 (patch) | |
| tree | 09ff9fc43280cf3263a0501fec6b6feee50e8939 /sound/usb/card.c | |
| parent | 36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207 (diff) | |
| download | linux-3.10-7e847894039d7590321de306fca2b1ae58662f29.tar.gz linux-3.10-7e847894039d7590321de306fca2b1ae58662f29.tar.bz2 linux-3.10-7e847894039d7590321de306fca2b1ae58662f29.zip | |
linux/usb/audio.h: split header
- Split the audio.h file in two to clearly denote the differences
between the standards.
- Add many more defines to audio-v2.h. Most of them are not currently
used.
- Replaced a magic value with a proper define
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/card.c')
| -rw-r--r-- | sound/usb/card.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 426aabc729d..78d12ff00e8 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -45,6 +45,7 @@ #include <linux/moduleparam.h> #include <linux/mutex.h> #include <linux/usb/audio.h> +#include <linux/usb/audio-v2.h> #include <sound/core.h> #include <sound/info.h> @@ -250,7 +251,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) * clock selectors and sample rate conversion units. */ cs = snd_usb_find_csint_desc(host_iface->extra, host_iface->extralen, - NULL, UAC_CLOCK_SOURCE); + NULL, UAC2_CLOCK_SOURCE); if (!cs) { snd_printk(KERN_ERR "CLOCK_SOURCE descriptor not found\n"); |