diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 11:21:15 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 11:21:15 +0100 |
commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /sound/usb/usx2y/usbusx2y.h | |
parent | ALSA: HDA: add powersaving hook for Realtek (diff) | |
parent | ALSA: hda/realtek: Remove extra .capsrc_nids initialization for ALC889_INTEL (diff) | |
download | linux-de8853bc38ceab1fa7e7f723b21430d4aad60fea.tar.xz linux-de8853bc38ceab1fa7e7f723b21430d4aad60fea.zip |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.h')
-rw-r--r-- | sound/usb/usx2y/usbusx2y.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h index 456b5fdbc339..1d174cea352b 100644 --- a/sound/usb/usx2y/usbusx2y.h +++ b/sound/usb/usx2y/usbusx2y.h @@ -22,7 +22,8 @@ struct snd_usX2Y_urbSeq { #include "usx2yhwdeppcm.h" struct usX2Ydev { - struct snd_usb_audio chip; + struct usb_device *dev; + int card_index; int stride; struct urb *In04urb; void *In04Buf; @@ -42,6 +43,9 @@ struct usX2Ydev { struct snd_usX2Y_substream *subs[4]; struct snd_usX2Y_substream * volatile prepare_subs; wait_queue_head_t prepare_wait_queue; + struct list_head midi_list; + struct list_head pcm_list; + int pcm_devs; }; |