Re: snd-powermac

[Elimar Riesebieter]

On Thu, 19 Aug 2004 the mental interface of
Elimar Riesebieter told:

> Hi all,
> 
> I tried the alsa-drivers 1.0.6 with 2.6.8.1 and got the following
> error while loading snd-powermac:
> 
> snd_powermac: Unknown symbol num_controls
> 
> $ gcc --version
> 
> gcc (GCC) 3.4.1 (Debian 3.4.1-5)
> 
> Any hint?
I patched kernel-source-2.8.6_2.8.6-2 with 
ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.alsa-project.org/\
kernel-patches/alsa-bk-2004-08-15.patch.gz. Loading this kernel
gives me "snd_powermac: Unknown symbol num_controls".

So I patched the "patched kernel" withe the attached patch and 1.0.6
runs perfect ;-)

Ciao

Elimar
-- 
  Numeric stability is probably not all that 
  important when you're guessing;-)

diff -ruN a/sound/ppc/awacs.c b/sound/ppc/awacs.c
--- a/sound/ppc/awacs.c 2004-08-21 16:00:21.594135586 +0200
+++ b/sound/ppc/awacs.c 2004-08-21 16:01:18.255497970 +0200
@@ -578,16 +578,6 @@
 /* FIXME: is this correct order?
  * screamer (powerbook G3 pismo) seems to have different bits...
  */
-static snd_kcontrol_new_t snd_pmac_awacs_mixers2[] __initdata = {
-       AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0),
-       AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0),
-};
-
-static snd_kcontrol_new_t snd_pmac_screamer_mixers2[] __initdata = {
-       AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),
-       AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0),
-};
-
 static snd_kcontrol_new_t snd_pmac_awacs_master_sw __initdata =
 AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1);
 
@@ -828,14 +818,6 @@
        if ((err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_mixers),
                                snd_pmac_awacs_mixers)) < 0)
                return err;
-       if (chip->model == PMAC_SCREAMER)
-               err = build_mixers(chip, 
num_controls(snd_pmac_screamer_mixers2),
-                                  snd_pmac_screamer_mixers2);
-       else
-               err = build_mixers(chip, num_controls(snd_pmac_awacs_mixers2),
-                                  snd_pmac_awacs_mixers2);
-       if (err < 0)
-               return err;
        chip->master_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_master_sw, chip);
        if ((err = snd_ctl_add(chip->card, chip->master_sw_ctl)) < 0)
                return err;

signature.asc
Description: Digital signature