summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRisto Suominen <Risto.Suominen@gmail.com>2009-01-20 22:01:14 +0200
committerTakashi Iwai <tiwai@suse.de>2009-03-09 14:58:07 +0100
commit573934bc038b0f47d17a5608e74b79dcd7c191ea (patch)
tree91bd945f1c112329fb0ec115356761ea6c34b427 /sound
parentb0a8a8fd1b3bd6fbbb4b599191b859d41e12a002 (diff)
downloadop-kernel-dev-573934bc038b0f47d17a5608e74b79dcd7c191ea.zip
op-kernel-dev-573934bc038b0f47d17a5608e74b79dcd7c191ea.tar.gz
ALSA: powermac - Correct volume controls for PowerBook G3 Lombard
Correct volume controls for PowerBook G3 Lombard (Screamer). Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/awacs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 0258ccb..d89c23e 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -773,6 +773,7 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \
|| machine_is_compatible("PowerMac4,1"))
#define IS_G4AGP (machine_is_compatible("PowerMac3,1"))
+#define IS_LOMBARD (machine_is_compatible("PowerBook1,1"))
static int imac1, imac2;
@@ -862,6 +863,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
int pm5500 = IS_PM5500;
int beige = IS_BEIGE;
int g4agp = IS_G4AGP;
+ int lombard = IS_LOMBARD;
int imac;
int err, vol;
@@ -972,7 +974,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_beige),
snd_pmac_screamer_mixers_beige);
- else if (imac)
+ else if (imac || lombard)
err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_imac),
snd_pmac_screamer_mixers_imac);
@@ -986,7 +988,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
snd_pmac_awacs_mixers_pmac);
if (err < 0)
return err;
- chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp)
+ chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp || lombard)
? &snd_pmac_awacs_master_sw_imac
: &snd_pmac_awacs_master_sw, chip);
err = snd_ctl_add(chip->card, chip->master_sw_ctl);
OpenPOWER on IntegriCloud