Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9478bc3bed1e15208f8041b44d45505cb93e6cc8
Commit:     9478bc3bed1e15208f8041b44d45505cb93e6cc8
Parent:     5be55be58c3255cf0b19c936353d4f6cebc38e4a
Author:     Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 23 11:52:38 2008 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:30:12 2008 +0100

    [ALSA] fix opti9xx/miro section mismatch
    
    snd_opti93x_mixer() is only called by __devinit snd_opti93x_probe(),
    so the former can also be __devinit.
    snd_miro_mixer() is only called by __devinit snd_miro_probe(),
    so the former can also be __devinit.
    sound/isa/opti9xx/opti92x-ad1848.c:
    WARNING: vmlinux.o(.text+0xf91cd7): Section mismatch: reference to 
.init.data:snd_opti93x_controls (between 'snd_opti93x_mixer' and 
'snd_card_opti9xx_free')
    WARNING: vmlinux.o(.text+0xf91d66): Section mismatch: reference to 
.init.data:snd_miro_controls (between 'snd_opti93x_mixer' and 
'snd_card_opti9xx_free')
    opti9xx/miro.c:
    WARNING: vmlinux.o(.text+0xf926c2): Section mismatch: reference to 
.init.data:snd_miro_controls (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf926e5): Section mismatch: reference to 
.init.data:snd_miro_eq_controls (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf926f9): Section mismatch: reference to 
.init.data:snd_miro_line_control (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf92716): Section mismatch: reference to 
.init.data:snd_miro_amp_control (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf9273e): Section mismatch: reference to 
.init.data:snd_miro_preamp_control (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf92764): Section mismatch: reference to 
.init.data:snd_miro_capture_control (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf92783): Section mismatch: reference to 
.init.data:snd_miro_radio_control (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf9279a): Section mismatch: reference to 
.init.data:snd_miro_eq_controls (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    WARNING: vmlinux.o(.text+0xf927b9): Section mismatch: reference to 
.init.data:snd_miro_radio_control (between 'snd_miro_mixer' and 
'snd_legacy_find_free_ioport')
    
    Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/isa/opti9xx/miro.c           |    2 +-
 sound/isa/opti9xx/opti92x-ad1848.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index b18d14f..2a1e2f5 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -669,7 +669,7 @@ static int __devinit snd_set_aci_init_values(struct 
snd_miro *miro)
        return 0;
 }
 
-static int snd_miro_mixer(struct snd_miro *miro)
+static int __devinit snd_miro_mixer(struct snd_miro *miro)
 {
        struct snd_card *card;
        unsigned int idx;
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c 
b/sound/isa/opti9xx/opti92x-ad1848.c
index 1f9c557..fe1afc1 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1594,7 +1594,7 @@ OPTi93X_DOUBLE("Capture Volume", 0, OPTi93X_MIXOUT_LEFT, 
OPTi93X_MIXOUT_RIGHT, 0
 }
 };
                                         
-static int snd_opti93x_mixer(struct snd_opti93x *chip)
+static int __devinit snd_opti93x_mixer(struct snd_opti93x *chip)
 {
        struct snd_card *card;
        struct snd_kcontrol_new knew;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to