Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6] / sound / pci / mixart / mixart_hwdep.c

diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 170781a72292c1bef14fd861b0099cb24048897f..f98603146132cd7b6aabfbb6862aa0c1f50e69ee 100644 (file)
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -20,7 +20,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/firmware.h>
@@ -614,7 +613,7 @@ static int mixart_hwdep_dsp_load(struct snd_hwdep *hw,
                           (int)dsp->length);
                return -ENOMEM;
        }
-       if (copy_from_user(fw.data, dsp->image, dsp->length)) {
+       if (copy_from_user((void *) fw.data, dsp->image, dsp->length)) {
                vfree(fw.data);
                return -EFAULT;
        }