ALSA CVS update

PPC AWACS driver
awacs.c num_controls -> ARRAY_SIZE fix

Signed-off-by: Joseph Fannin <jhf@rivenstone.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 42dcc2ae66743ec39809a6314c6bdc799c96f7e7..e052bd071e5bf1875af5732995e7871e26045d1c 100644 (file)
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -829,10 +829,10 @@ snd_pmac_awacs_init(pmac_t *chip)
                                snd_pmac_awacs_mixers)) < 0)
                return err;
        if (chip->model == PMAC_SCREAMER)
-               err = build_mixers(chip, num_controls(snd_pmac_screamer_mixers2),
+               err = build_mixers(chip, ARRAY_SIZE(snd_pmac_screamer_mixers2),
                                   snd_pmac_screamer_mixers2);
        else
-               err = build_mixers(chip, num_controls(snd_pmac_awacs_mixers2),
+               err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_mixers2),
                                   snd_pmac_awacs_mixers2);
        if (err < 0)
                return err;