summaryrefslogtreecommitdiff
path: root/sound/usb/usx2y/usbusx2y.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-04 18:22:37 +0300
committerTakashi Iwai <tiwai@suse.de>2009-12-04 18:22:37 +0300
commit57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch)
tree218c74fde12577ea22f51eabcf4e8b65273edb54 /sound/usb/usx2y/usbusx2y.h
parent79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff)
parentfb716c0b7bed36064cd41d800c8f339f41adf084 (diff)
downloadlinux-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.xz
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.h')
-rw-r--r--sound/usb/usx2y/usbusx2y.h6
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;
};