diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-19 02:21:40 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-19 02:21:57 -0400 |
| commit | 1558eb838ff502faafacf26b6a711dbaae796009 (patch) | |
| tree | 8049ea20a214033369725ed58b8b4a3ca4110887 /sound/pci/hda/patch_cirrus.c | |
| parent | 4609ed6b1f0ab9f11a9d0361573b53d9d057c440 (diff) | |
| parent | 81fcb170852d58d7ebd8101a8ef970c82056426e (diff) | |
Merge branch 'topic/pm-convert' into for-next
This merges the changes for converting to new PM ops for platform
and some other drivers.
Also move some header files to local places from the public
include/sound.
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 9647ed4d7929..0c4c1a61b378 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
| @@ -1892,7 +1892,7 @@ static int cs421x_parse_auto_config(struct hda_codec *codec) | |||
| 1892 | Manage PDREF, when transitioning to D3hot | 1892 | Manage PDREF, when transitioning to D3hot |
| 1893 | (DAC,ADC) -> D3, PDREF=1, AFG->D3 | 1893 | (DAC,ADC) -> D3, PDREF=1, AFG->D3 |
| 1894 | */ | 1894 | */ |
| 1895 | static int cs421x_suspend(struct hda_codec *codec, pm_message_t state) | 1895 | static int cs421x_suspend(struct hda_codec *codec) |
| 1896 | { | 1896 | { |
| 1897 | struct cs_spec *spec = codec->spec; | 1897 | struct cs_spec *spec = codec->spec; |
| 1898 | unsigned int coef; | 1898 | unsigned int coef; |