diff options
author | Steve French <sfrench@us.ibm.com> | 2005-08-30 20:33:26 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 20:33:26 +0200 |
commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /sound/pci/hda/hda_patch.h | |
parent | [CIFS] Remove cifs_sb argument from *build_path_from_dentry (diff) | |
parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
download | linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.xz linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/pci/hda/hda_patch.h')
-rw-r--r-- | sound/pci/hda/hda_patch.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_patch.h b/sound/pci/hda/hda_patch.h index a5de684b6944..acaef3c811b8 100644 --- a/sound/pci/hda/hda_patch.h +++ b/sound/pci/hda/hda_patch.h @@ -10,11 +10,14 @@ extern struct hda_codec_preset snd_hda_preset_cmedia[]; extern struct hda_codec_preset snd_hda_preset_analog[]; /* SigmaTel codecs */ extern struct hda_codec_preset snd_hda_preset_sigmatel[]; +/* SiLabs 3054/3055 modem codecs */ +extern struct hda_codec_preset snd_hda_preset_si3054[]; static const struct hda_codec_preset *hda_preset_tables[] = { snd_hda_preset_realtek, snd_hda_preset_cmedia, snd_hda_preset_analog, snd_hda_preset_sigmatel, + snd_hda_preset_si3054, NULL }; |