linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / ppc / toonie.c

diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c
index 1ac7c85..053b8f2 100644 (file)
--- a/sound/ppc/toonie.c
+++ b/sound/ppc/toonie.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include <linux/i2c-dev.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
@@ -117,7 +118,7 @@ static int toonie_get_mute_switch(struct snd_kcontrol *kcontrol,
                gp = &mix->amp_mute_gpio;
                break;
        default:
-               return -EINVAL;
+               return -EINVAL;;
        }
        ucontrol->value.integer.value[0] = !check_audio_gpio(gp);
        return 0;
@@ -145,7 +146,7 @@ static int toonie_put_mute_switch(struct snd_kcontrol *kcontrol,
                gp = &mix->amp_mute_gpio;
                break;
        default:
-               return -EINVAL;
+               return -EINVAL;;
        }
        val = ! check_audio_gpio(gp);
        if (val != ucontrol->value.integer.value[0]) {
@@ -335,7 +336,7 @@ static void toonie_cleanup(struct snd_pmac *chip)
        chip->mixer_data = NULL;
 }
 
-int __init snd_pmac_toonie_init(struct snd_pmac *chip)
+int snd_pmac_toonie_init(struct snd_pmac *chip)
 {
        struct pmac_toonie *mix;