diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:06:12 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 08:18:47 (GMT) |
| commit | c1ab9cab75098924fa8226a8a371de66977439df (patch) | |
| tree | 767e77302ca8f2eb781c60624bc8518cd50ba6eb /sound/oss/sb_common.c | |
| parent | ff0ff84a0767df48d728c36510365344a7e7d582 (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
| download | linux-fsl-qoriq-c1ab9cab75098924fa8226a8a371de66977439df.tar.xz | |
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/oss/sb_common.c')
| -rw-r--r-- | sound/oss/sb_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c index ce4db49..7d42c54 100644 --- a/sound/oss/sb_common.c +++ b/sound/oss/sb_common.c @@ -31,6 +31,7 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/spinlock.h> +#include <linux/slab.h> #include "sound_config.h" #include "sound_firmware.h" |