diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-28 11:21:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-28 11:21:11 +0100 |
| commit | 92f12adcb50841a24f1e5a6643c50a8e07c3ba28 (patch) | |
| tree | 1e636d5f6ee6a6ac19c96cd9093ac9c9810a9d22 /sound | |
| parent | b7320f3e64c947baa17b9aa67619dd6e205f8b18 (diff) | |
| parent | 8460ae70bb6bf1729bd247465c02b7a8c986c61d (diff) | |
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/ppc/pmac.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |