diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:57 +0200 |
| commit | 9cd9f4276766e15be40d09f77e28656797a1b06f (patch) | |
| tree | 970770f66b6d2e0e444b6ea6f39491c1b1e1a158 /sound | |
| parent | 0f23c5cc50550f194e71e694f2b4433356dd99ea (diff) | |
| parent | b8c60ede6abf8e96a892c114131700b0cfb0be89 (diff) | |
| download | linux-9cd9f4276766e15be40d09f77e28656797a1b06f.tar.gz linux-9cd9f4276766e15be40d09f77e28656797a1b06f.tar.bz2 linux-9cd9f4276766e15be40d09f77e28656797a1b06f.zip | |
Merge branch 'topic/misc' into for-linus
* topic/misc:
ALSA: Remove unneeded ifdef from sound/core.h
ALSA: Remove struct snd_monitor_file from public sound/core.h
ALSA: Release v1.0.21
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index d5d40d78c409..ec4a50ce5656 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -31,6 +31,14 @@ #include <sound/control.h> #include <sound/info.h> +/* monitor files for graceful shutdown (hotplug) */ +struct snd_monitor_file { + struct file *file; + const struct file_operations *disconnected_f_op; + struct list_head shutdown_list; /* still need to shutdown */ + struct list_head list; /* link of monitor files */ +}; + static DEFINE_SPINLOCK(shutdown_lock); static LIST_HEAD(shutdown_files); |