summaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/virtuoso.c
diff options
context:
space:
mode:
authorClemens Ladisch2008-09-22 09:02:08 +0200
committerClemens Ladisch2008-09-22 09:02:08 +0200
commitd76596b1ee7f5cdbd0b73d374ba72372a2c8b725 (patch)
tree8ecb3fde83a1eb3c67efcb99c90ad993731ed479 /sound/pci/oxygen/virtuoso.c
parentALSA: virtuoso: create common functions for GPIO bit switch controls (diff)
downloadkernel-qcow2-linux-d76596b1ee7f5cdbd0b73d374ba72372a2c8b725.tar.gz
kernel-qcow2-linux-d76596b1ee7f5cdbd0b73d374ba72372a2c8b725.tar.xz
kernel-qcow2-linux-d76596b1ee7f5cdbd0b73d374ba72372a2c8b725.zip
ALSA: oxygen: rename pcm_dev_cfg
Rename the pcm_dev_cfg field to device_config because there will be additional flags that do not describe PCM devices. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r--sound/pci/oxygen/virtuoso.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 34baff19ad36..f416e68338e2 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -566,10 +566,10 @@ static const struct oxygen_model model_xonar_d2 = {
.update_dac_mute = update_pcm1796_mute,
.dac_tlv = pcm1796_db_scale,
.model_data_size = sizeof(struct xonar_data),
- .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
- PLAYBACK_1_TO_SPDIF |
- CAPTURE_0_FROM_I2S_2 |
- CAPTURE_1_FROM_SPDIF,
+ .device_config = PLAYBACK_0_TO_I2S |
+ PLAYBACK_1_TO_SPDIF |
+ CAPTURE_0_FROM_I2S_2 |
+ CAPTURE_1_FROM_SPDIF,
.dac_channels = 8,
.dac_volume_min = 0x0f,
.dac_volume_max = 0xff,
@@ -598,9 +598,9 @@ static const struct oxygen_model model_xonar_d1 = {
.ac97_switch = xonar_d1_ac97_switch,
.dac_tlv = cs4362a_db_scale,
.model_data_size = sizeof(struct xonar_data),
- .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
- PLAYBACK_1_TO_SPDIF |
- CAPTURE_0_FROM_I2S_2,
+ .device_config = PLAYBACK_0_TO_I2S |
+ PLAYBACK_1_TO_SPDIF |
+ CAPTURE_0_FROM_I2S_2,
.dac_channels = 8,
.dac_volume_min = 0,
.dac_volume_max = 127,