diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /sound/usb/usbaudio.h | |
parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb/usbaudio.h')
-rw-r--r-- | sound/usb/usbaudio.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 06ebf24d3a4..24d3319cc34 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
@@ -40,9 +40,6 @@ struct snd_usb_audio { | |||
40 | int num_interfaces; | 40 | int num_interfaces; |
41 | int num_suspended_intf; | 41 | int num_suspended_intf; |
42 | 42 | ||
43 | /* for audio class v2 */ | ||
44 | int clock_id; | ||
45 | |||
46 | struct list_head pcm_list; /* list of pcm streams */ | 43 | struct list_head pcm_list; /* list of pcm streams */ |
47 | int pcm_devs; | 44 | int pcm_devs; |
48 | 45 | ||
@@ -53,6 +50,8 @@ struct snd_usb_audio { | |||
53 | int setup; /* from the 'device_setup' module param */ | 50 | int setup; /* from the 'device_setup' module param */ |
54 | int nrpacks; /* from the 'nrpacks' module param */ | 51 | int nrpacks; /* from the 'nrpacks' module param */ |
55 | int async_unlink; /* from the 'async_unlink' module param */ | 52 | int async_unlink; /* from the 'async_unlink' module param */ |
53 | |||
54 | struct usb_host_interface *ctrl_intf; /* the audio control interface */ | ||
56 | }; | 55 | }; |
57 | 56 | ||
58 | /* | 57 | /* |