git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[sfrench/cifs-2.6.git]
/
sound
/
usb
/
usbaudio.h
diff --git
a/sound/usb/usbaudio.h
b/sound/usb/usbaudio.h
index 2272f45a18674320977d5314a6608b4449a27312..7cf18c38dc424c14a1decd29614105cfc4412e81 100644
(file)
--- a/
sound/usb/usbaudio.h
+++ b/
sound/usb/usbaudio.h
@@
-126,6
+126,7
@@
struct snd_usb_audio {
u32 usb_id;
int shutdown;
int num_interfaces;
+ int num_suspended_intf;
struct list_head pcm_list; /* list of pcm streams */
int pcm_devs;