git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
[pandora-kernel.git]
/
sound
/
usb
/
usbaudio.h
diff --git
a/sound/usb/usbaudio.h
b/sound/usb/usbaudio.h
index
0f4b2b8
..
7cf18c3
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;
u32 usb_id;
int shutdown;
int num_interfaces;
+ int num_suspended_intf;
struct list_head pcm_list; /* list of pcm streams */
int pcm_devs;
struct list_head pcm_list; /* list of pcm streams */
int pcm_devs;
@@
-159,6
+160,7
@@
enum quirk_type {
QUIRK_AUDIO_FIXED_ENDPOINT,
QUIRK_AUDIO_EDIROL_UA700_UA25,
QUIRK_AUDIO_EDIROL_UA1000,
QUIRK_AUDIO_FIXED_ENDPOINT,
QUIRK_AUDIO_EDIROL_UA700_UA25,
QUIRK_AUDIO_EDIROL_UA1000,
+ QUIRK_AUDIO_EDIROL_UA101,
QUIRK_TYPE_COUNT
};
QUIRK_TYPE_COUNT
};