Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace

[karo-tx-linux.git] / sound / core / seq / seq_clientmgr.h

diff --git a/sound/core/seq/seq_clientmgr.h b/sound/core/seq/seq_clientmgr.h
index 450091ca153d270f4eddd0c6494432638331a19b..20f0a725ec7db293a1edc18c83af60fe3ab11d34 100644 (file)
--- a/sound/core/seq/seq_clientmgr.h
+++ b/sound/core/seq/seq_clientmgr.h
@@ -58,7 +58,7 @@ struct snd_seq_client {
        int num_ports;          /* number of ports */
        struct list_head ports_list_head;
        rwlock_t ports_lock;
-       struct semaphore ports_mutex;
+       struct mutex ports_mutex;
        int convert32;          /* convert 32->64bit */
 
        /* output pool */
@@ -98,4 +98,6 @@ int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table
 int snd_seq_client_notify_subscription(int client, int port,
                                       struct snd_seq_port_subscribe *info, int evtype);
 
+extern int seq_client_load[15];
+
 #endif