Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

[linux-2.6] / sound / pci / emu10k1 / voice.c

diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c
index 94eca82dd4fc06914b1b698cfcdbc527b99e2d52..958cb2a65a4ec8f79680f1bd8ed2a3570bfd2273 100644 (file)
--- a/sound/pci/emu10k1/voice.c
+++ b/sound/pci/emu10k1/voice.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *                   Lee Revell <rlrevell@joe-job.com>
  *  Routines for control of EMU10K1 chips - voice manager
@@ -28,7 +28,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
@@ -83,7 +82,7 @@ static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
        if (first_voice == last_voice)
                return -ENOMEM;
        
-       for (i=0; i < number; i++) {
+       for (i = 0; i < number; i++) {
                voice = &emu->voices[(first_voice + i) % NUM_G];
                // printk("voice alloc - %i, %i of %i\n", voice->number, idx-first_voice+1, number);
                voice->use = 1;