diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 15:37:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 15:37:00 +0100 |
| commit | 07c1debab224e45afb7c1a6822ad4b388c103a25 (patch) | |
| tree | bedfd2e9a59fe479821c5fc4916f6591e1e7d385 /sound | |
| parent | 3dc6d2b9b1c0e5689790aa1c05a05b33d0877c3f (diff) | |
| parent | 480cf663e6988b3e79b570b42d2dbdb6c2ba9b94 (diff) | |
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/cs46xx/cs46xx_lib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index fb6dc3980257..8ab07aa63652 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -3640,7 +3640,10 @@ int snd_cs46xx_resume(struct pci_dev *pci) { struct snd_card *card = pci_get_drvdata(pci); struct snd_cs46xx *chip = card->private_data; - int i, amp_saved; + int amp_saved; +#ifdef CONFIG_SND_CS46XX_NEW_DSP + int i; +#endif pci_set_power_state(pci, PCI_D0); pci_restore_state(pci); |