diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 11:28:45 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 11:28:45 +0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /sound/core/seq/oss/seq_oss_writeq.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
| download | linux-9343af084c7e8911897b0883042ee690cee3aaef.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'sound/core/seq/oss/seq_oss_writeq.c')
| -rw-r--r-- | sound/core/seq/oss/seq_oss_writeq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/seq/oss/seq_oss_writeq.c b/sound/core/seq/oss/seq_oss_writeq.c index 217424858191..d50338bbc21f 100644 --- a/sound/core/seq/oss/seq_oss_writeq.c +++ b/sound/core/seq/oss/seq_oss_writeq.c @@ -27,6 +27,7 @@ #include "../seq_lock.h" #include "../seq_clientmgr.h" #include <linux/wait.h> +#include <linux/slab.h> /* |