diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/pci/vx222/vx222_ops.c | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'sound/pci/vx222/vx222_ops.c')
| -rw-r--r-- | sound/pci/vx222/vx222_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index b4bfc1acde88..631f3a639993 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c | |||
| @@ -359,7 +359,7 @@ static int vx2_load_xilinx_binary(struct vx_core *chip, const struct firmware *x | |||
| 359 | { | 359 | { |
| 360 | unsigned int i; | 360 | unsigned int i; |
| 361 | unsigned int port; | 361 | unsigned int port; |
| 362 | unsigned char *image; | 362 | const unsigned char *image; |
| 363 | 363 | ||
| 364 | /* XILINX reset (wait at least 1 milisecond between reset on and off). */ | 364 | /* XILINX reset (wait at least 1 milisecond between reset on and off). */ |
| 365 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); | 365 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); |