diff --git a/[refs] b/[refs] index a108e7821747..289abae270f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d32e03d01649d2dd837923470f3f323e3b88253 +refs/heads/master: 82a783f4bcb878e6c4f02e24c7cd0687bdea7443 diff --git a/trunk/include/sound/core.h b/trunk/include/sound/core.h index 309cb9659a05..3bb07bc62255 100644 --- a/trunk/include/sound/core.h +++ b/trunk/include/sound/core.h @@ -93,15 +93,6 @@ struct snd_device { #define snd_device(n) list_entry(n, struct snd_device, list) -/* 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 */ -}; - /* main structure for soundcard */ struct snd_card { diff --git a/trunk/sound/core/init.c b/trunk/sound/core/init.c index d5d40d78c409..ec4a50ce5656 100644 --- a/trunk/sound/core/init.c +++ b/trunk/sound/core/init.c @@ -31,6 +31,14 @@ #include #include +/* 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);