summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRisto Suominen <Risto.Suominen@gmail.com>2009-01-20 22:01:15 +0200
committerTakashi Iwai <tiwai@suse.de>2009-03-09 14:58:13 +0100
commit4d9e93b1adf2923c0a0cbc545d6e78dec3334faf (patch)
tree7c2e4a5ac79c98ffdd57c1936ede55ef8601dfbb
parent573934bc038b0f47d17a5608e74b79dcd7c191ea (diff)
downloadlinux-stable-4d9e93b1adf2923c0a0cbc545d6e78dec3334faf.tar.gz
linux-stable-4d9e93b1adf2923c0a0cbc545d6e78dec3334faf.tar.bz2
linux-stable-4d9e93b1adf2923c0a0cbc545d6e78dec3334faf.zip
ALSA: powermac - Correct volume controls and HP detection for PMac 8500/9500
Correct volume controls and headphone detection for PowerMac 8500/9500 (AWACS). Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/ppc/awacs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index d89c23e135dc..9abbf645eb67 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -766,7 +766,9 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
}
#endif /* CONFIG_PM */
-#define IS_PM7500 (machine_is_compatible("AAPL,7500"))
+#define IS_PM7500 (machine_is_compatible("AAPL,7500") \
+ || machine_is_compatible("AAPL,8500") \
+ || machine_is_compatible("AAPL,9500"))
#define IS_PM5500 (machine_is_compatible("AAPL,e411"))
#define IS_BEIGE (machine_is_compatible("AAPL,Gossamer"))
#define IS_IMAC1 (machine_is_compatible("PowerMac2,1"))