diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-18 07:44:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-18 07:44:55 +0100 |
| commit | 321051f5daf059e7290aa7d60af55482c8bb896a (patch) | |
| tree | 03705bf5ea28fc2f284228a9a621193cc9a5bb66 /sound/pci/hda/hda_local.h | |
| parent | d9ab344336f74c012f6643ed3d1ad8ca0136de3b (diff) | |
| parent | cbbf50b22f9693218f9f0d460432266b04fc960d (diff) | |
| download | talos-op-linux-321051f5daf059e7290aa7d60af55482c8bb896a.tar.gz talos-op-linux-321051f5daf059e7290aa7d60af55482c8bb896a.zip | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 46bbefe2e4a9..3ab5e7a303db 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -140,7 +140,7 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir, struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, const char *name); int snd_hda_add_vmaster(struct hda_codec *codec, char *name, - unsigned int *tlv, const char **slaves); + unsigned int *tlv, const char * const *slaves); int snd_hda_codec_reset(struct hda_codec *codec); /* amp value bits */ @@ -341,10 +341,10 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen); * Misc */ int snd_hda_check_board_config(struct hda_codec *codec, int num_configs, - const char **modelnames, + const char * const *modelnames, const struct snd_pci_quirk *pci_list); int snd_hda_check_board_codec_sid_config(struct hda_codec *codec, - int num_configs, const char **models, + int num_configs, const char * const *models, const struct snd_pci_quirk *tbl); int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew); |
