Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[sfrench/cifs-2.6.git] / sound / ppc / pmac.h

diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index 086da7a1890902edded8becc605895baf92562f4..25c512c2d74d2cb577a9163f04026d49717ae52c 100644 (file)
--- 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 {
@@ -113,7 +113,8 @@ struct snd_pmac {
        unsigned int initialized : 1;
        unsigned int feature_is_set : 1;
 
-       unsigned int of_requested;
+       unsigned int requested;
+       struct resource rsrc[3];
 
        int num_freqs;
        int *freq_table;
@@ -187,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 {
@@ -202,8 +202,8 @@ int snd_pmac_keywest_init(struct pmac_keywest *i2c);
 void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c);
 
 /* misc */
-int snd_pmac_boolean_stereo_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-int snd_pmac_boolean_mono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
+#define snd_pmac_boolean_stereo_info   snd_ctl_boolean_stereo_info
+#define snd_pmac_boolean_mono_info     snd_ctl_boolean_mono_info
 
 int snd_pmac_add_automute(struct snd_pmac *chip);