locks: allow lockd to process blocked locks during grace period

[safe/jmp/linux-2.6] / sound / drivers / vx / vx_core.c

diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index ed19bc1..585af2e 100644 (file)
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -20,7 +20,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
@@ -454,7 +453,7 @@ int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *boot)
                        vx_outb(chip, TXM, 0);
                        vx_outb(chip, TXL, 0);
                } else {
-                       unsigned char *image = boot->data + i;
+                       const unsigned char *image = boot->data + i;
                        if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) {
                                snd_printk(KERN_ERR "dsp boot failed at %d\n", i);
                                return -EIO;
@@ -672,7 +671,7 @@ int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp)
        unsigned int i;
        int err;
        unsigned int csum = 0;
-       unsigned char *image, *cptr;
+       const unsigned char *image, *cptr;
 
        snd_assert(dsp->size % 3 == 0, return -EINVAL);