aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/es1968.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/es1968.c')
-rw-r--r--sound/pci/es1968.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index fb4c90b99c00..5d0e568fdea1 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -491,7 +491,7 @@ struct esschan {
491 /* linked list */ 491 /* linked list */
492 struct list_head list; 492 struct list_head list;
493 493
494#ifdef CONFIG_PM 494#ifdef CONFIG_PM_SLEEP
495 u16 wc_map[4]; 495 u16 wc_map[4];
496#endif 496#endif
497}; 497};
@@ -544,7 +544,7 @@ struct es1968 {
544 struct list_head substream_list; 544 struct list_head substream_list;
545 spinlock_t substream_lock; 545 spinlock_t substream_lock;
546 546
547#ifdef CONFIG_PM 547#ifdef CONFIG_PM_SLEEP
548 u16 apu_map[NR_APUS][NR_APU_REGS]; 548 u16 apu_map[NR_APUS][NR_APU_REGS];
549#endif 549#endif
550 550
@@ -706,7 +706,7 @@ static void __apu_set_register(struct es1968 *chip, u16 channel, u8 reg, u16 dat
706{ 706{
707 if (snd_BUG_ON(channel >= NR_APUS)) 707 if (snd_BUG_ON(channel >= NR_APUS))
708 return; 708 return;
709#ifdef CONFIG_PM 709#ifdef CONFIG_PM_SLEEP
710 chip->apu_map[channel][reg] = data; 710 chip->apu_map[channel][reg] = data;
711#endif 711#endif
712 reg |= (channel << 4); 712 reg |= (channel << 4);
@@ -993,7 +993,7 @@ static void snd_es1968_program_wavecache(struct es1968 *chip, struct esschan *es
993 /* set the wavecache control reg */ 993 /* set the wavecache control reg */
994 wave_set_register(chip, es->apu[channel] << 3, tmpval); 994 wave_set_register(chip, es->apu[channel] << 3, tmpval);
995 995
996#ifdef CONFIG_PM 996#ifdef CONFIG_PM_SLEEP
997 es->wc_map[channel] = tmpval; 997 es->wc_map[channel] = tmpval;
998#endif 998#endif
999} 999}
@@ -2377,7 +2377,7 @@ static void snd_es1968_start_irq(struct es1968 *chip)
2377 outw(w, chip->io_port + ESM_PORT_HOST_IRQ); 2377 outw(w, chip->io_port + ESM_PORT_HOST_IRQ);
2378} 2378}
2379 2379
2380#ifdef CONFIG_PM 2380#ifdef CONFIG_PM_SLEEP
2381/* 2381/*
2382 * PM support 2382 * PM support
2383 */ 2383 */
@@ -2461,7 +2461,7 @@ static SIMPLE_DEV_PM_OPS(es1968_pm, es1968_suspend, es1968_resume);
2461#define ES1968_PM_OPS &es1968_pm 2461#define ES1968_PM_OPS &es1968_pm
2462#else 2462#else
2463#define ES1968_PM_OPS NULL 2463#define ES1968_PM_OPS NULL
2464#endif /* CONFIG_PM */ 2464#endif /* CONFIG_PM_SLEEP */
2465 2465
2466#ifdef SUPPORT_JOYSTICK 2466#ifdef SUPPORT_JOYSTICK
2467#define JOYSTICK_ADDR 0x200 2467#define JOYSTICK_ADDR 0x200