Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

	sound/pci/Kconfig

2 files changed, 3 insertions, 3 deletions

diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c
index abe5c59b72df..000e6fed6e39 100644
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/sound/pci/pcxhr/pcxhr_core.c
@@ -269,7 +269,7 @@ int pcxhr_load_xilinx_binary(struct pcxhr_mgr *mgr, const struct firmware *xilin
         unsigned int chipsc;
         unsigned char data;
         unsigned char mask;
-        unsigned char *image;
+        const unsigned char *image;
 
         /* test first xilinx */
         chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC);
@@ -316,7 +316,7 @@ static int pcxhr_download_dsp(struct pcxhr_mgr *mgr, const struct firmware *dsp)
         int err;
         unsigned int i;
         unsigned int len;
-        unsigned char *data;
+        const unsigned char *data;
         unsigned char dummy;
         /* check the length of boot image */
         snd_assert(dsp->size > 0, return -EINVAL);
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index e6a4bfbb91bb..d2f043278cf4 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -394,7 +394,7 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw,
                            (unsigned long)fw.size);
                 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;
         }