aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/dmasound/dmasound_awacs.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/dmasound/dmasound_awacs.c')
-rw-r--r--sound/oss/dmasound/dmasound_awacs.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 33108661e671..2704e1598add 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -255,7 +255,7 @@ static int awacs_burgundy_read_mvolume(unsigned address);
255 255
256static volatile struct dbdma_cmd *emergency_dbdma_cmd; 256static volatile struct dbdma_cmd *emergency_dbdma_cmd;
257 257
258#ifdef CONFIG_PMAC_PBOOK 258#ifdef CONFIG_PM
259/* 259/*
260 * Stuff for restoring after a sleep. 260 * Stuff for restoring after a sleep.
261 */ 261 */
@@ -263,7 +263,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when);
263struct pmu_sleep_notifier awacs_sleep_notifier = { 263struct pmu_sleep_notifier awacs_sleep_notifier = {
264 awacs_sleep_notify, SLEEP_LEVEL_SOUND, 264 awacs_sleep_notify, SLEEP_LEVEL_SOUND,
265}; 265};
266#endif /* CONFIG_PMAC_PBOOK */ 266#endif /* CONFIG_PM */
267 267
268/* for (soft) sample rate translations */ 268/* for (soft) sample rate translations */
269int expand_bal; /* Balance factor for expanding (not volume!) */ 269int expand_bal; /* Balance factor for expanding (not volume!) */
@@ -675,7 +675,7 @@ static void PMacIrqCleanup(void)
675 kfree(awacs_rx_cmd_space); 675 kfree(awacs_rx_cmd_space);
676 kfree(beep_dbdma_cmd_space); 676 kfree(beep_dbdma_cmd_space);
677 kfree(beep_buf); 677 kfree(beep_buf);
678#ifdef CONFIG_PMAC_PBOOK 678#ifdef CONFIG_PM
679 pmu_unregister_sleep_notifier(&awacs_sleep_notifier); 679 pmu_unregister_sleep_notifier(&awacs_sleep_notifier);
680#endif 680#endif
681} 681}
@@ -1415,7 +1415,7 @@ load_awacs(void)
1415 } 1415 }
1416} 1416}
1417 1417
1418#ifdef CONFIG_PMAC_PBOOK 1418#ifdef CONFIG_PM
1419/* 1419/*
1420 * Save state when going to sleep, restore it afterwards. 1420 * Save state when going to sleep, restore it afterwards.
1421 */ 1421 */
@@ -1551,7 +1551,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
1551 } 1551 }
1552 return PBOOK_SLEEP_OK; 1552 return PBOOK_SLEEP_OK;
1553} 1553}
1554#endif /* CONFIG_PMAC_PBOOK */ 1554#endif /* CONFIG_PM */
1555 1555
1556 1556
1557/* All the burgundy functions: */ 1557/* All the burgundy functions: */
@@ -3053,9 +3053,9 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
3053 if ((res=setup_beep())) 3053 if ((res=setup_beep()))
3054 return res ; 3054 return res ;
3055 3055
3056#ifdef CONFIG_PMAC_PBOOK 3056#ifdef CONFIG_PM
3057 pmu_register_sleep_notifier(&awacs_sleep_notifier); 3057 pmu_register_sleep_notifier(&awacs_sleep_notifier);
3058#endif /* CONFIG_PMAC_PBOOK */ 3058#endif /* CONFIG_PM */
3059 3059
3060 /* Powerbooks have odd ways of enabling inputs such as 3060 /* Powerbooks have odd ways of enabling inputs such as
3061 an expansion-bay CD or sound from an internal modem 3061 an expansion-bay CD or sound from an internal modem