diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-06-21 09:43:44 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:34:39 -0400 |
commit | 55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 (patch) | |
tree | a15a2e0134adae10e76eca5434be29a0115011a0 /sound/ppc/pmac.h | |
parent | f3d9478b2ce468c3115b02ecae7e975990697f15 (diff) |
[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 { | |||
85 | 85 | ||
86 | enum snd_pmac_model { | 86 | enum snd_pmac_model { |
87 | PMAC_AWACS, PMAC_SCREAMER, PMAC_BURGUNDY, PMAC_DACA, PMAC_TUMBLER, | 87 | PMAC_AWACS, PMAC_SCREAMER, PMAC_BURGUNDY, PMAC_DACA, PMAC_TUMBLER, |
88 | PMAC_SNAPPER, PMAC_TOONIE | 88 | PMAC_SNAPPER |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct snd_pmac { | 91 | struct snd_pmac { |
@@ -188,7 +188,6 @@ int snd_pmac_burgundy_init(struct snd_pmac *chip); | |||
188 | int snd_pmac_daca_init(struct snd_pmac *chip); | 188 | int snd_pmac_daca_init(struct snd_pmac *chip); |
189 | int snd_pmac_tumbler_init(struct snd_pmac *chip); | 189 | int snd_pmac_tumbler_init(struct snd_pmac *chip); |
190 | int snd_pmac_tumbler_post_init(void); | 190 | int snd_pmac_tumbler_post_init(void); |
191 | int snd_pmac_toonie_init(struct snd_pmac *chip); | ||
192 | 191 | ||
193 | /* i2c functions */ | 192 | /* i2c functions */ |
194 | struct pmac_keywest { | 193 | struct pmac_keywest { |