aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-09-22 03:02:08 -0400
committerClemens Ladisch <clemens@ladisch.de>2008-09-22 03:02:08 -0400
commitd76596b1ee7f5cdbd0b73d374ba72372a2c8b725 (patch)
tree8ecb3fde83a1eb3c67efcb99c90ad993731ed479 /sound/pci/oxygen/oxygen.c
parentc3f00739c5e45b4bf6f759172a5318256b92f2b2 (diff)
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/oxygen.c')
-rw-r--r--sound/pci/oxygen/oxygen.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 043fe281358e..bb2e7d82d832 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -292,10 +292,10 @@ static int generic_probe(struct oxygen *chip, unsigned long driver_data)
292 chip->model.init = meridian_init; 292 chip->model.init = meridian_init;
293 chip->model.resume = ak4396_registers_init; 293 chip->model.resume = ak4396_registers_init;
294 chip->model.set_adc_params = set_ak5385_params; 294 chip->model.set_adc_params = set_ak5385_params;
295 chip->model.pcm_dev_cfg = PLAYBACK_0_TO_I2S | 295 chip->model.device_config = PLAYBACK_0_TO_I2S |
296 PLAYBACK_1_TO_SPDIF | 296 PLAYBACK_1_TO_SPDIF |
297 CAPTURE_0_FROM_I2S_2 | 297 CAPTURE_0_FROM_I2S_2 |
298 CAPTURE_1_FROM_SPDIF; 298 CAPTURE_1_FROM_SPDIF;
299 chip->model.misc_flags = OXYGEN_MISC_MIDI; 299 chip->model.misc_flags = OXYGEN_MISC_MIDI;
300 } 300 }
301 return 0; 301 return 0;
@@ -316,12 +316,12 @@ static const struct oxygen_model model_generic = {
316 .update_dac_mute = update_ak4396_mute, 316 .update_dac_mute = update_ak4396_mute,
317 .dac_tlv = ak4396_db_scale, 317 .dac_tlv = ak4396_db_scale,
318 .model_data_size = sizeof(struct generic_data), 318 .model_data_size = sizeof(struct generic_data),
319 .pcm_dev_cfg = PLAYBACK_0_TO_I2S | 319 .device_config = PLAYBACK_0_TO_I2S |
320 PLAYBACK_1_TO_SPDIF | 320 PLAYBACK_1_TO_SPDIF |
321 PLAYBACK_2_TO_AC97_1 | 321 PLAYBACK_2_TO_AC97_1 |
322 CAPTURE_0_FROM_I2S_1 | 322 CAPTURE_0_FROM_I2S_1 |
323 CAPTURE_1_FROM_SPDIF | 323 CAPTURE_1_FROM_SPDIF |
324 CAPTURE_2_FROM_AC97_1, 324 CAPTURE_2_FROM_AC97_1,
325 .dac_channels = 8, 325 .dac_channels = 8,
326 .dac_volume_min = 0, 326 .dac_volume_min = 0,
327 .dac_volume_max = 255, 327 .dac_volume_max = 255,