summaryrefslogtreecommitdiffstats
path: root/sound/oss/sb_mixer.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
committerJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
commitf9221fd80343285514568da6c5dbda0f87109de8 (patch)
tree3a2f0077ebea9d094bdeedb319c97cb591d51c51 /sound/oss/sb_mixer.c
parentocfs2_dlmfs: Fix math error when reading LVB. (diff)
parentocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff)
downloadlinux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz
linux-f9221fd80343285514568da6c5dbda0f87109de8.zip
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'sound/oss/sb_mixer.c')
-rw-r--r--sound/oss/sb_mixer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index fad1a4f25ad6..2039d31b7e22 100644
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -16,6 +16,8 @@
* Stanislav Voronyi <stas@esc.kharkov.com> : Support for AWE 3DSE device (Jun 7 1999)
*/
+#include <linux/slab.h>
+
#include "sound_config.h"
#define __SB_MIXER_C__