diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-20 17:08:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-20 17:08:01 +0200 |
| commit | 9c6c529a21cd3b6efb367256a239eec4153721c0 (patch) | |
| tree | 8233ebf48f18cd458fcdda99798c4317a3f17735 /sound/pci/ctxfi | |
| parent | bc5304b6fb6c572452b538512761a126f0e0b0d8 (diff) | |
| parent | 55fe27f7e2c9d24ce870136bd99ae67b020122d1 (diff) | |
| download | linux-stable-9c6c529a21cd3b6efb367256a239eec4153721c0.tar.gz linux-stable-9c6c529a21cd3b6efb367256a239eec4153721c0.tar.bz2 linux-stable-9c6c529a21cd3b6efb367256a239eec4153721c0.zip | |
Merge branch 'fix/ctxfi' into topic/ctxfi
Diffstat (limited to 'sound/pci/ctxfi')
| -rw-r--r-- | sound/pci/ctxfi/ctdaio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 082e35c08c02..deb6cfa73600 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -57,9 +57,9 @@ struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = { struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = { [LINEO1] = {.left = 0x40, .right = 0x41}, - [LINEO2] = {.left = 0x70, .right = 0x71}, + [LINEO2] = {.left = 0x60, .right = 0x61}, [LINEO3] = {.left = 0x50, .right = 0x51}, - [LINEO4] = {.left = 0x60, .right = 0x61}, + [LINEO4] = {.left = 0x70, .right = 0x71}, [LINEIM] = {.left = 0x45, .right = 0xc5}, [SPDIFOO] = {.left = 0x00, .right = 0x01}, [SPDIFIO] = {.left = 0x05, .right = 0x85}, |