Fix a const pointer usage warning in the Digigram VX soundcard driver

[linux-2.6-omap-h63xx.git] / sound / drivers / vx / vx_hwdep.c

diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c
index e1920af4501de5b94f6a0808589271445d5942e3..efd22e92bcedea68f2a1de780f8e2b919b3d33fe 100644 (file)
--- a/sound/drivers/vx/vx_hwdep.c
+++ b/sound/drivers/vx/vx_hwdep.c
@@ -20,7 +20,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
@@ -30,6 +29,20 @@
 
 #ifdef SND_VX_FW_LOADER
 
+MODULE_FIRMWARE("vx/bx_1_vxp.b56");
+MODULE_FIRMWARE("vx/bx_1_vp4.b56");
+MODULE_FIRMWARE("vx/x1_1_vx2.xlx");
+MODULE_FIRMWARE("vx/x1_2_v22.xlx");
+MODULE_FIRMWARE("vx/x1_1_vxp.xlx");
+MODULE_FIRMWARE("vx/x1_1_vp4.xlx");
+MODULE_FIRMWARE("vx/bd56002.boot");
+MODULE_FIRMWARE("vx/bd563v2.boot");
+MODULE_FIRMWARE("vx/bd563s3.boot");
+MODULE_FIRMWARE("vx/l_1_vx2.d56");
+MODULE_FIRMWARE("vx/l_1_v22.d56");
+MODULE_FIRMWARE("vx/l_1_vxp.d56");
+MODULE_FIRMWARE("vx/l_1_vp4.d56");
+
 int snd_vx_setup_firmware(struct vx_core *chip)
 {
        static char *fw_files[VX_TYPE_NUMS][4] = {
@@ -170,7 +183,7 @@ static int vx_hwdep_dsp_load(struct snd_hwdep *hw,
                kfree(fw);
                return -ENOMEM;
        }
-       if (copy_from_user(fw->data, dsp->image, dsp->length)) {
+       if (copy_from_user((void *)fw->data, dsp->image, dsp->length)) {
                free_fw(fw);
                return -EFAULT;
        }