diff options
| author | Thomas Gleixner <[email protected]> | 2010-10-12 14:41:22 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2010-10-12 14:41:26 +0000 |
| commit | 7c5f13519a67aa7ba3a99155f128d4bdef87d087 (patch) | |
| tree | e4d0537092930a53a85932de83a7861990c58607 /sound/pci/oxygen/oxygen.c | |
| parent | Merge branch 'x86/cleanups' into irq/sparseirq (diff) | |
| parent | x86, hpet: Fix bogus error check in hpet_assign_irq() (diff) | |
| download | kernel-7c5f13519a67aa7ba3a99155f128d4bdef87d087.tar.gz kernel-7c5f13519a67aa7ba3a99155f128d4bdef87d087.zip | |
Merge branch 'x86/urgent' of into irq/sparseirq
Reason: Pull in the latest io_apic bugfixes
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 289cb4dacfc7..6c0a11adb2a8 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -543,6 +543,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip, chip->model.suspend = claro_suspend; chip->model.resume = claro_resume; chip->model.set_adc_params = set_ak5385_params; + chip->model.device_config = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | + CAPTURE_0_FROM_I2S_2 | + CAPTURE_1_FROM_SPDIF; break; } if (id->driver_data == MODEL_MERIDIAN || |