Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / sound / usb / format.h

diff --git a/sound/usb/format.h b/sound/usb/format.h
index 8298c4e8ddfaf2a6750f49a6129457d9f5f7bd5a..387924f0af85de9b419440b2c043b8b9faa1a8de 100644 (file)
--- a/sound/usb/format.h
+++ b/sound/usb/format.h
@@ -1,8 +1,9 @@
 #ifndef __USBAUDIO_FORMAT_H
 #define __USBAUDIO_FORMAT_H
 
-int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fp,
-                              int format, unsigned char *fmt, int stream,
-                              struct usb_host_interface *iface);
+int snd_usb_parse_audio_format(struct snd_usb_audio *chip,
+                              struct audioformat *fp, int format,
+                              struct uac_format_type_i_continuous_descriptor *fmt,
+                              int stream, struct usb_host_interface *iface);
 
 #endif /*  __USBAUDIO_FORMAT_H */