Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus

[cascardo/linux.git] / sound / usb / format.h

diff --git a/sound/usb/format.h b/sound/usb/format.h
index 387924f..6f31522 100644 (file)
--- a/sound/usb/format.h
+++ b/sound/usb/format.h
@@ -2,7 +2,7 @@
 #define __USBAUDIO_FORMAT_H
 
 int snd_usb_parse_audio_format(struct snd_usb_audio *chip,
-                              struct audioformat *fp, int format,
+                              struct audioformat *fp, unsigned int format,
                               struct uac_format_type_i_continuous_descriptor *fmt,
                               int stream, struct usb_host_interface *iface);