summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRisto Suominen <Risto.Suominen@gmail.com>2011-02-28 10:38:45 +0200
committerTakashi Iwai <tiwai@suse.de>2011-02-28 11:19:17 +0100
commit8460ae70bb6bf1729bd247465c02b7a8c986c61d (patch)
tree0416092d8ac9b18610752e9f950299839ed4bd76
parentb6aa63eeb3e9670edd44162b441b6b7de304fed0 (diff)
downloadop-kernel-dev-8460ae70bb6bf1729bd247465c02b7a8c986c61d.zip
op-kernel-dev-8460ae70bb6bf1729bd247465c02b7a8c986c61d.tar.gz
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 <Risto.Suominen@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/ppc/pmac.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index b47cfd4..3ecbd67 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);
OpenPOWER on IntegriCloud