Merge branch 'linus' into core/printk

[linux-2.6] / sound / pci / oxygen / oxygen.h

diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index fde995cf2edfeda2d848b5501f4d760e68edd7fd..a71c6e059260543c08b172f4fd71e3bdd0f5eef8 100644 (file)
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -97,12 +97,16 @@ struct oxygen_model {
                               struct snd_pcm_hw_params *params);
        void (*update_dac_volume)(struct oxygen *chip);
        void (*update_dac_mute)(struct oxygen *chip);
-       void (*ac97_switch_hook)(struct oxygen *chip, unsigned int codec,
-                                unsigned int reg, int mute);
        void (*gpio_changed)(struct oxygen *chip);
+       void (*ac97_switch)(struct oxygen *chip,
+                           unsigned int reg, unsigned int mute);
+       const unsigned int *dac_tlv;
        size_t model_data_size;
        unsigned int pcm_dev_cfg;
        u8 dac_channels;
+       u8 dac_volume_min;
+       u8 dac_volume_max;
+       u8 misc_flags;
        u8 function_flags;
        u16 dac_i2s_format;
        u16 adc_i2s_format;
@@ -110,7 +114,7 @@ struct oxygen_model {
 
 /* oxygen_lib.c */
 
-int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, int midi,
+int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
                     const struct oxygen_model *model);
 void oxygen_pci_remove(struct pci_dev *pci);
 
@@ -147,6 +151,7 @@ void oxygen_write_ac97_masked(struct oxygen *chip, unsigned int codec,
                              unsigned int index, u16 data, u16 mask);
 
 void oxygen_write_spi(struct oxygen *chip, u8 control, unsigned int data);
+void oxygen_write_i2c(struct oxygen *chip, u8 device, u8 map, u8 data);
 
 static inline void oxygen_set_bits8(struct oxygen *chip,
                                    unsigned int reg, u8 value)