Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106

[safe/jmp/linux-2.6] / sound / pci / ac97 / ac97_pcm.c

diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c
index 4281e6d..48cbda9 100644 (file)
--- a/sound/pci/ac97/ac97_pcm.c
+++ b/sound/pci/ac97/ac97_pcm.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
@@ -23,7 +23,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -575,7 +574,6 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
        r = rate > 48000;
        bus = pcm->bus;
        if (cfg == AC97_PCM_CFG_SPDIF) {
-               int err;
                for (cidx = 0; cidx < 4; cidx++)
                        if (bus->codec[cidx] && (bus->codec[cidx]->ext_id & AC97_EI_SPDIF)) {
                                err = set_spdif_rate(bus->codec[cidx], rate);