diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-29 21:50:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-29 21:50:33 +0200 |
| commit | a98d3984c85222aa9efc63c4f9dd3d805ce469f2 (patch) | |
| tree | aeb9ebdcc06ca92b8114f30cedf16b8f3780b3f2 /sound/usb/format.h | |
| parent | 52593de4c11fb24c83d8036ba34706881aab5e3d (diff) | |
| parent | 55567ab70bd8551c73253e44ea5244db41eac81b (diff) | |
| download | op-kernel-dev-a98d3984c85222aa9efc63c4f9dd3d805ce469f2.zip op-kernel-dev-a98d3984c85222aa9efc63c4f9dd3d805ce469f2.tar.gz | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/usb/format.h')
| -rw-r--r-- | sound/usb/format.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/usb/format.h b/sound/usb/format.h index 8298c4e..387924f 100644 --- 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 */ |
