diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2006-06-21 15:43:44 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 21:34:39 +0200 |
| commit | 55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 (patch) | |
| tree | a15a2e0134adae10e76eca5434be29a0115011a0 /sound/ppc/pmac.h | |
| parent | [ALSA] snd-aoa: add snd-aoa (diff) | |
| download | linux-55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125.tar.xz linux-55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125.zip | |
[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/pmac.h')
| -rw-r--r-- | sound/ppc/pmac.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h index 3a9bd4dbb9a6..8394e66ceb00 100644 --- a/sound/ppc/pmac.h +++ b/sound/ppc/pmac.h @@ -85,7 +85,7 @@ struct pmac_stream { enum snd_pmac_model { PMAC_AWACS, PMAC_SCREAMER, PMAC_BURGUNDY, PMAC_DACA, PMAC_TUMBLER, - PMAC_SNAPPER, PMAC_TOONIE + PMAC_SNAPPER }; struct snd_pmac { @@ -188,7 +188,6 @@ int snd_pmac_burgundy_init(struct snd_pmac *chip); int snd_pmac_daca_init(struct snd_pmac *chip); int snd_pmac_tumbler_init(struct snd_pmac *chip); int snd_pmac_tumbler_post_init(void); -int snd_pmac_toonie_init(struct snd_pmac *chip); /* i2c functions */ struct pmac_keywest { |