diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:45 +0100 |
| commit | 65b3864b85485a91f70988e1a222e3935bce87e4 (patch) | |
| tree | 425063aeaa3c22f3956cc4dc7fc3d8173e9bd172 /include/sound | |
| parent | bafdb7278cb6a215a8a451024fa1604d790cb7b4 (diff) | |
| parent | 118dd6bfe7e0cddc8ab417ead19cc76000e92773 (diff) | |
| download | kernel_samsung_smdk4412-65b3864b85485a91f70988e1a222e3935bce87e4.zip kernel_samsung_smdk4412-65b3864b85485a91f70988e1a222e3935bce87e4.tar.gz kernel_samsung_smdk4412-65b3864b85485a91f70988e1a222e3935bce87e4.tar.bz2 | |
Merge branch 'topic/ctl-list-cleanup' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 59491f2..3dea798 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -97,9 +97,9 @@ struct snd_device { struct snd_monitor_file { struct file *file; - struct snd_monitor_file *next; const struct file_operations *disconnected_f_op; - struct list_head shutdown_list; + struct list_head shutdown_list; /* still need to shutdown */ + struct list_head list; /* link of monitor files */ }; /* main structure for soundcard */ @@ -134,7 +134,7 @@ struct snd_card { struct snd_info_entry *proc_id; /* the card id */ struct proc_dir_entry *proc_root_link; /* number link to real id */ - struct snd_monitor_file *files; /* all files associated to this card */ + struct list_head files_list; /* all files associated to this card */ struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown state */ spinlock_t files_lock; /* lock the files for this card */ |