diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:18 +0100 |
| commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
| tree | 7569661eae727a5a349e4c98dba42ca681857462 /sound/pci/hda/hda_codec.h | |
| parent | Merge branch 'topic/misc' into for-linus (diff) | |
| parent | ALSA: hda - Fix the lost power-setup of seconary pins after PM resume (diff) | |
| download | linux-9e4ce164ee3a1d07580f017069c25d180b0aa785.tar.xz linux-9e4ce164ee3a1d07580f017069c25d180b0aa785.zip | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 564471169cae..e9f71dc0d464 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -547,9 +547,6 @@ enum { /* max. codec address */ #define HDA_MAX_CODEC_ADDRESS 0x0f -/* max number of PCM devics per card */ -#define HDA_MAX_PCMS 10 - /* * generic arrays */ @@ -869,6 +866,9 @@ struct hda_codec { void (*proc_widget_hook)(struct snd_info_buffer *buffer, struct hda_codec *codec, hda_nid_t nid); + /* jack detection */ + struct snd_array jacktbl; + #ifdef CONFIG_SND_HDA_INPUT_JACK /* jack detection */ struct snd_array jacks; |