diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /sound/oss/vwsnd.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/oss/vwsnd.c')
| -rw-r--r-- | sound/oss/vwsnd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 6713110bdc75..20b3b325aa80 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c | |||
| @@ -149,6 +149,7 @@ | |||
| 149 | #include <linux/wait.h> | 149 | #include <linux/wait.h> |
| 150 | #include <linux/interrupt.h> | 150 | #include <linux/interrupt.h> |
| 151 | #include <linux/mutex.h> | 151 | #include <linux/mutex.h> |
| 152 | #include <linux/slab.h> | ||
| 152 | 153 | ||
| 153 | #include <asm/visws/cobalt.h> | 154 | #include <asm/visws/cobalt.h> |
| 154 | 155 | ||