aboutsummaryrefslogtreecommitdiffstats
path: root/sound/ppc/pmac.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r--sound/ppc/pmac.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 080ef3928465..75b8b7423036 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -36,7 +36,7 @@
36#include <asm/pci-bridge.h> 36#include <asm/pci-bridge.h>
37 37
38 38
39#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK) 39#ifdef CONFIG_PM
40static int snd_pmac_register_sleep_notifier(pmac_t *chip); 40static int snd_pmac_register_sleep_notifier(pmac_t *chip);
41static int snd_pmac_unregister_sleep_notifier(pmac_t *chip); 41static int snd_pmac_unregister_sleep_notifier(pmac_t *chip);
42static int snd_pmac_suspend(snd_card_t *card, pm_message_t state); 42static int snd_pmac_suspend(snd_card_t *card, pm_message_t state);
@@ -782,7 +782,7 @@ static int snd_pmac_free(pmac_t *chip)
782 } 782 }
783 783
784 snd_pmac_sound_feature(chip, 0); 784 snd_pmac_sound_feature(chip, 0);
785#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK) 785#ifdef CONFIG_PM
786 snd_pmac_unregister_sleep_notifier(chip); 786 snd_pmac_unregister_sleep_notifier(chip);
787#endif 787#endif
788 788
@@ -1292,7 +1292,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
1292 /* Reset dbdma channels */ 1292 /* Reset dbdma channels */
1293 snd_pmac_dbdma_reset(chip); 1293 snd_pmac_dbdma_reset(chip);
1294 1294
1295#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK) 1295#ifdef CONFIG_PM
1296 /* add sleep notifier */ 1296 /* add sleep notifier */
1297 if (! snd_pmac_register_sleep_notifier(chip)) 1297 if (! snd_pmac_register_sleep_notifier(chip))
1298 snd_card_set_pm_callback(chip->card, snd_pmac_suspend, snd_pmac_resume, chip); 1298 snd_card_set_pm_callback(chip->card, snd_pmac_suspend, snd_pmac_resume, chip);
@@ -1316,7 +1316,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
1316 * sleep notify for powerbook 1316 * sleep notify for powerbook
1317 */ 1317 */
1318 1318
1319#if defined(CONFIG_PM) && defined(CONFIG_PMAC_PBOOK) 1319#ifdef CONFIG_PM
1320 1320
1321/* 1321/*
1322 * Save state when going to sleep, restore it afterwards. 1322 * Save state when going to sleep, restore it afterwards.
@@ -1414,4 +1414,5 @@ static int snd_pmac_unregister_sleep_notifier(pmac_t *chip)
1414 return 0; 1414 return 0;
1415} 1415}
1416 1416
1417#endif /* CONFIG_PM && CONFIG_PMAC_PBOOK */ 1417#endif /* CONFIG_PM */
1418