diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 08:05:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 08:05:50 -0800 |
| commit | b7c15e4a1cbf19be3d3063819b472806902fb525 (patch) | |
| tree | 802103cb642b9e7fb76677de544289a754cf4c57 /include | |
| parent | 6a7f6ec9512970874fa9fc883ea44d77d0f287c2 (diff) | |
| parent | 27de094f54a4d96bae2cd3121eb157bb8a34f729 (diff) | |
| download | linux-3.10-b7c15e4a1cbf19be3d3063819b472806902fb525.tar.gz linux-3.10-b7c15e4a1cbf19be3d3063819b472806902fb525.tar.bz2 linux-3.10-b7c15e4a1cbf19be3d3063819b472806902fb525.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix initialization for HP 2011 notebooks
ALSA: hda - Add support for VMware controller
ALSA: hda - consitify string arrays
ALSA: hda - Add add multi-streaming playback for AD1988
ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code
ASoC: WM8990: msleep() takes milliseconds not jiffies
ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu
ALSA: constify functions in ac97
ASoC: WL1273 FM radio: Fix breakage with MFD API changes
ALSA: hda - More coverage for odd-number channels elimination for HDMI
ALSA: hda - Store PCM parameters properly in HDMI open callback
ALSA: hda - Rearrange fixup struct in patch_realtek.c
ALSA: oxygen: Xonar DG: fix CS4245 register writes
ALSA: hda - Suppress the odd number of channels for HDMI
ALSA: hda - Add fixup-call in init callback
ALSA: hda - Reorganize fixup structure for Realtek
ALSA: hda - Apply Sony VAIO hweq fixup only once
ALSA: hda - Apply mario fixup only once
ALSA: hda - Remove unused fixup entry for ALC262
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ac97_codec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 49400459b47..b602f475cdb 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -477,7 +477,7 @@ struct snd_ac97_template { struct snd_ac97 { /* -- lowlevel (hardware) driver specific -- */ - struct snd_ac97_build_ops * build_ops; + const struct snd_ac97_build_ops *build_ops; void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ |