diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 09:02:08 +0200 |
|---|---|---|
| committer | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 09:02:08 +0200 |
| commit | d76596b1ee7f5cdbd0b73d374ba72372a2c8b725 (patch) | |
| tree | 8ecb3fde83a1eb3c67efcb99c90ad993731ed479 /sound/pci/oxygen/oxygen.c | |
| parent | c3f00739c5e45b4bf6f759172a5318256b92f2b2 (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.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 043fe281358..bb2e7d82d83 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) chip->model.init = meridian_init; chip->model.resume = ak4396_registers_init; chip->model.set_adc_params = set_ak5385_params; - chip->model.pcm_dev_cfg = PLAYBACK_0_TO_I2S | - PLAYBACK_1_TO_SPDIF | - CAPTURE_0_FROM_I2S_2 | - CAPTURE_1_FROM_SPDIF; + chip->model.device_config = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | + CAPTURE_0_FROM_I2S_2 | + CAPTURE_1_FROM_SPDIF; chip->model.misc_flags = OXYGEN_MISC_MIDI; } return 0; @@ -316,12 +316,12 @@ static const struct oxygen_model model_generic = { .update_dac_mute = update_ak4396_mute, .dac_tlv = ak4396_db_scale, .model_data_size = sizeof(struct generic_data), - .pcm_dev_cfg = PLAYBACK_0_TO_I2S | - PLAYBACK_1_TO_SPDIF | - PLAYBACK_2_TO_AC97_1 | - CAPTURE_0_FROM_I2S_1 | - CAPTURE_1_FROM_SPDIF | - CAPTURE_2_FROM_AC97_1, + .device_config = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | + PLAYBACK_2_TO_AC97_1 | + CAPTURE_0_FROM_I2S_1 | + CAPTURE_1_FROM_SPDIF | + CAPTURE_2_FROM_AC97_1, .dac_channels = 8, .dac_volume_min = 0, .dac_volume_max = 255, |