Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[pandora-kernel.git] / sound / oss / sb_mixer.c

diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index ccb21d4..2039d31 100644 (file)
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -1,5 +1,5 @@
 /*
- * sound/sb_mixer.c
+ * sound/oss/sb_mixer.c
  *
  * The low level mixer driver for the Sound Blaster compatible cards.
  */
@@ -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__
@@ -734,7 +736,7 @@ int sb_mixer_init(sb_devc * devc, struct module *owner)
        if (m == -1)
                return 0;
 
-       mixer_devs[m] = (struct mixer_operations *)kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
+       mixer_devs[m] = kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
        if (mixer_devs[m] == NULL)
        {
                printk(KERN_ERR "sb_mixer: Can't allocate memory\n");