diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-25 02:37:49 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:14 -0500 |
commit | 976cd62700ae378df330ec82112da3d17e33a0fe (patch) | |
tree | 22d31425c0940b8d7105c4914fd944fcc3c2a8d9 /sound/pci/oxygen/oxygen.c | |
parent | 09189ac793d7fef7d0f058815043e3d4bf7097c0 (diff) |
[ALSA] oxygen: make the number of analog output configurable
Add a field to struct oxygen_model to allow model drivers for cards with
less than eight output channels.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 4f809bdc75e1..60af3a7d9824 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -350,6 +350,7 @@ static const struct oxygen_model model_generic = { | |||
350 | .update_dac_volume = update_ak4396_volume, | 350 | .update_dac_volume = update_ak4396_volume, |
351 | .update_dac_mute = update_ak4396_mute, | 351 | .update_dac_mute = update_ak4396_mute, |
352 | .model_data_size = sizeof(struct generic_data), | 352 | .model_data_size = sizeof(struct generic_data), |
353 | .dac_channels = 8, | ||
353 | .used_channels = OXYGEN_CHANNEL_A | | 354 | .used_channels = OXYGEN_CHANNEL_A | |
354 | OXYGEN_CHANNEL_C | | 355 | OXYGEN_CHANNEL_C | |
355 | OXYGEN_CHANNEL_SPDIF | | 356 | OXYGEN_CHANNEL_SPDIF | |
@@ -372,6 +373,7 @@ static const struct oxygen_model model_meridian = { | |||
372 | .update_dac_volume = update_ak4396_volume, | 373 | .update_dac_volume = update_ak4396_volume, |
373 | .update_dac_mute = update_ak4396_mute, | 374 | .update_dac_mute = update_ak4396_mute, |
374 | .model_data_size = sizeof(struct generic_data), | 375 | .model_data_size = sizeof(struct generic_data), |
376 | .dac_channels = 8, | ||
375 | .used_channels = OXYGEN_CHANNEL_B | | 377 | .used_channels = OXYGEN_CHANNEL_B | |
376 | OXYGEN_CHANNEL_C | | 378 | OXYGEN_CHANNEL_C | |
377 | OXYGEN_CHANNEL_SPDIF | | 379 | OXYGEN_CHANNEL_SPDIF | |