aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-01-10 09:59:38 -0500
committerTakashi Iwai <tiwai@suse.de>2011-01-10 10:45:53 -0500
commit1f4d7be7293aecd5f8469a46f606f62f0f05d84c (patch)
treed0caf037ec00a8684b18e8d413990c82cfc5f48a /sound/pci/oxygen/oxygen.h
parent3daa7ea650d59ae86926f0ced4c4ccd99ab33fda (diff)
ALSA: oxygen: allow different number of PCM and mixer channels
For cards like the Xonar HDAV1.3, differentiate between the number of PCM channels that can be played and the number of channels whose volume can be adjusted. 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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index b8fbc15b89a3..3d9535c2debb 100644
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -100,7 +100,8 @@ struct oxygen_model {
100 unsigned long private_data; 100 unsigned long private_data;
101 size_t model_data_size; 101 size_t model_data_size;
102 unsigned int device_config; 102 unsigned int device_config;
103 u8 dac_channels; 103 u8 dac_channels_pcm;
104 u8 dac_channels_mixer;
104 u8 dac_volume_min; 105 u8 dac_volume_min;
105 u8 dac_volume_max; 106 u8 dac_volume_max;
106 u8 misc_flags; 107 u8 misc_flags;