diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-28 09:26:59 -0700 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-28 09:26:59 -0700 |
| commit | a184d4e4591bb53fd8b91d6e8b85cffa261fb83e (patch) | |
| tree | d8d530703e39fcfd612934105d5e1b5fab94d85c /sound/pci/hda/hda_codec.h | |
| parent | 5d908ab941e90291b5c31d990bdb8e87fa3f7146 (diff) | |
| parent | c36b5b054aaf14d68261970e3769398110e636d8 (diff) | |
Merge branch 'for-linus' into for-next
Need to merge the fixes regarding EPSS.
Conflicts:
sound/pci/hda/hda_codec.c
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 13c834f20440..72477ccb20f9 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -866,6 +866,7 @@ struct hda_codec { unsigned int ignore_misc_bit:1; /* ignore MISC_NO_PRESENCE bit */ unsigned int no_jack_detect:1; /* Machine has no jack-detection */ unsigned int pcm_format_first:1; /* PCM format must be set first */ + unsigned int epss:1; /* supporting EPSS? */ #ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ int power_transition; /* power-state in transition */ |