aboutsummaryrefslogtreecommitdiff
path: root/sound/ppc/powermac.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2006-06-21 15:43:44 +0200
committerJaroslav Kysela <perex@suse.cz>2006-06-22 21:34:39 +0200
commit55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 (patch)
treea15a2e0134adae10e76eca5434be29a0115011a0 /sound/ppc/powermac.c
parentf3d9478b2ce468c3115b02ecae7e975990697f15 (diff)
downloadlinux-55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125.tar.gz
[ALSA] snd-powermac: no longer handle anything with a layout-id property
This patch removes from snd-powermac the code that check for the layout-id and instead adds code that makes it refuse loading when a layout-id property is present, nothing that snd-aoa should be used. It also removes the 'toonie' codec from snd-powermac which was only ever used on the mac mini which has a layout-id property. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc/powermac.c')
-rw-r--r--sound/ppc/powermac.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 875f1f7bdc5..fa9a44ab487 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -94,13 +94,6 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0)
goto __error;
break;
- case PMAC_TOONIE:
- strcpy(card->driver, "PMac Toonie");
- strcpy(card->shortname, "PowerMac Toonie");
- strcpy(card->longname, card->shortname);
- if ((err = snd_pmac_toonie_init(chip)) < 0)
- goto __error;
- break;
case PMAC_AWACS:
case PMAC_SCREAMER:
name_ext = chip->model == PMAC_SCREAMER ? "Screamer" : "AWACS";