Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

[karo-tx-linux.git] / sound / pci / ac97 / ac97_pcm.c

diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c
index 8cbc03332b013e4c630a1a15c915b4e0dbab4b10..48cbda9378c5fc2ed4b295f7731c44ae1a11e58c 100644 (file)
--- a/sound/pci/ac97/ac97_pcm.c
+++ b/sound/pci/ac97/ac97_pcm.c
@@ -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);