Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[linux-2.6-microblaze.git] / sound / usb / format.h

diff --git a/sound/usb/format.h b/sound/usb/format.h
index 8c3ff9c..e701718 100644 (file)
--- a/sound/usb/format.h
+++ b/sound/usb/format.h
@@ -3,8 +3,12 @@
 #define __USBAUDIO_FORMAT_H
 
 int snd_usb_parse_audio_format(struct snd_usb_audio *chip,
-                              struct audioformat *fp, unsigned int format,
+                              struct audioformat *fp, u64 format,
                               struct uac_format_type_i_continuous_descriptor *fmt,
                               int stream);
 
+int snd_usb_parse_audio_format_v3(struct snd_usb_audio *chip,
+                              struct audioformat *fp,
+                              struct uac3_as_header_descriptor *as,
+                              int stream);
 #endif /*  __USBAUDIO_FORMAT_H */