diff options
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 569d2aa4eeb..694327ae8b7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -2386,7 +2386,7 @@ static int alc_suspend(struct hda_codec *codec, pm_message_t state) | |||
2386 | } | 2386 | } |
2387 | #endif | 2387 | #endif |
2388 | 2388 | ||
2389 | #ifdef SND_HDA_NEEDS_RESUME | 2389 | #ifdef CONFIG_PM |
2390 | static int alc_resume(struct hda_codec *codec) | 2390 | static int alc_resume(struct hda_codec *codec) |
2391 | { | 2391 | { |
2392 | msleep(150); /* to avoid pop noise */ | 2392 | msleep(150); /* to avoid pop noise */ |
@@ -2406,7 +2406,7 @@ static const struct hda_codec_ops alc_patch_ops = { | |||
2406 | .init = alc_init, | 2406 | .init = alc_init, |
2407 | .free = alc_free, | 2407 | .free = alc_free, |
2408 | .unsol_event = alc_unsol_event, | 2408 | .unsol_event = alc_unsol_event, |
2409 | #ifdef SND_HDA_NEEDS_RESUME | 2409 | #ifdef CONFIG_PM |
2410 | .resume = alc_resume, | 2410 | .resume = alc_resume, |
2411 | #endif | 2411 | #endif |
2412 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 2412 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
@@ -4413,7 +4413,7 @@ static void alc269_shutup(struct hda_codec *codec) | |||
4413 | } | 4413 | } |
4414 | } | 4414 | } |
4415 | 4415 | ||
4416 | #ifdef SND_HDA_NEEDS_RESUME | 4416 | #ifdef CONFIG_PM |
4417 | static int alc269_resume(struct hda_codec *codec) | 4417 | static int alc269_resume(struct hda_codec *codec) |
4418 | { | 4418 | { |
4419 | if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) { | 4419 | if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) { |
@@ -4436,7 +4436,7 @@ static int alc269_resume(struct hda_codec *codec) | |||
4436 | hda_call_check_power_status(codec, 0x01); | 4436 | hda_call_check_power_status(codec, 0x01); |
4437 | return 0; | 4437 | return 0; |
4438 | } | 4438 | } |
4439 | #endif /* SND_HDA_NEEDS_RESUME */ | 4439 | #endif /* CONFIG_PM */ |
4440 | 4440 | ||
4441 | static void alc269_fixup_hweq(struct hda_codec *codec, | 4441 | static void alc269_fixup_hweq(struct hda_codec *codec, |
4442 | const struct alc_fixup *fix, int action) | 4442 | const struct alc_fixup *fix, int action) |
@@ -4728,7 +4728,7 @@ static int patch_alc269(struct hda_codec *codec) | |||
4728 | spec->vmaster_nid = 0x02; | 4728 | spec->vmaster_nid = 0x02; |
4729 | 4729 | ||
4730 | codec->patch_ops = alc_patch_ops; | 4730 | codec->patch_ops = alc_patch_ops; |
4731 | #ifdef SND_HDA_NEEDS_RESUME | 4731 | #ifdef CONFIG_PM |
4732 | codec->patch_ops.resume = alc269_resume; | 4732 | codec->patch_ops.resume = alc269_resume; |
4733 | #endif | 4733 | #endif |
4734 | if (board_config == ALC_MODEL_AUTO) | 4734 | if (board_config == ALC_MODEL_AUTO) |