From: Risto Suominen Date: Mon, 28 Feb 2011 08:38:45 +0000 (+0200) Subject: ALSA: powermac - Allow input from microphone on Tumbler X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8460ae70bb6bf1729bd247465c02b7a8c986c61d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ALSA: powermac - Allow input from microphone on Tumbler Allow input from microphone on remaining PowerBooks and iBooks with Tumbler. Tested only with PowerBook G4 Gigabit Ethernet (PowerBook3,3). [Fixed to use of_machine_is_compatible by tiwai] Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai --- diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index b47cfd45b3b9..3ecbd67f88c9 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -1034,7 +1034,11 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip) if (of_device_is_compatible(sound, "tumbler")) { chip->model = PMAC_TUMBLER; chip->can_capture = of_machine_is_compatible("PowerMac4,2") - || of_machine_is_compatible("PowerBook4,1"); + || of_machine_is_compatible("PowerBook3,2") + || of_machine_is_compatible("PowerBook3,3") + || of_machine_is_compatible("PowerBook4,1") + || of_machine_is_compatible("PowerBook4,2") + || of_machine_is_compatible("PowerBook4,3"); chip->can_duplex = 0; // chip->can_byte_swap = 0; /* FIXME: check this */ chip->num_freqs = ARRAY_SIZE(tumbler_freqs);