diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 03:20:59 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:28 -0400 |
commit | db12b8e301455cf18644aa3b765ae10869eb947c (patch) | |
tree | a572f2ed562624cb06431b82a3ee4a19725763ad /sound/pci/oxygen/oxygen.h | |
parent | 87eedd2fd409d5cd515ccd6fc454cef15c5fa38b (diff) |
[ALSA] oxygen: move MIDI flag to model struct
Put the flag that enables the MIDI port into the model structure instead
of passing it as a separate parameter to oxygen_pci_probe().
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
-rw-r--r-- | sound/pci/oxygen/oxygen.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index fde995cf2edf..5103482f65e4 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h | |||
@@ -103,6 +103,7 @@ struct oxygen_model { | |||
103 | size_t model_data_size; | 103 | size_t model_data_size; |
104 | unsigned int pcm_dev_cfg; | 104 | unsigned int pcm_dev_cfg; |
105 | u8 dac_channels; | 105 | u8 dac_channels; |
106 | u8 misc_flags; | ||
106 | u8 function_flags; | 107 | u8 function_flags; |
107 | u16 dac_i2s_format; | 108 | u16 dac_i2s_format; |
108 | u16 adc_i2s_format; | 109 | u16 adc_i2s_format; |
@@ -110,7 +111,7 @@ struct oxygen_model { | |||
110 | 111 | ||
111 | /* oxygen_lib.c */ | 112 | /* oxygen_lib.c */ |
112 | 113 | ||
113 | int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, int midi, | 114 | int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, |
114 | const struct oxygen_model *model); | 115 | const struct oxygen_model *model); |
115 | void oxygen_pci_remove(struct pci_dev *pci); | 116 | void oxygen_pci_remove(struct pci_dev *pci); |
116 | 117 | ||