diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
| commit | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch) | |
| tree | 218c74fde12577ea22f51eabcf4e8b65273edb54 /sound/usb/usx2y/us122l.h | |
| parent | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff) | |
| parent | fb716c0b7bed36064cd41d800c8f339f41adf084 (diff) | |
| download | linux-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.gz linux-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.bz2 linux-57648cd52b1848c6885bdbd948d113d52f3ddd43.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/usx2y/us122l.h')
| -rw-r--r-- | sound/usb/usx2y/us122l.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/usx2y/us122l.h b/sound/usb/usx2y/us122l.h index 3d10c4b2a0f5..4daf1982e821 100644 --- a/sound/usb/usx2y/us122l.h +++ b/sound/usb/usx2y/us122l.h @@ -3,7 +3,8 @@ struct us122l { - struct snd_usb_audio chip; + struct usb_device *dev; + int card_index; int stride; struct usb_stream_kernel sk; @@ -12,6 +13,7 @@ struct us122l { unsigned second_periods_polled; struct file *master; struct file *slave; + struct list_head midi_list; atomic_t mmap_count; }; |