diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/pci/ice1712/wtm.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/pci/ice1712/wtm.h')
| -rw-r--r-- | sound/pci/ice1712/wtm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ice1712/wtm.h b/sound/pci/ice1712/wtm.h index 03a394e442f1..423c1a204c0b 100644 --- a/sound/pci/ice1712/wtm.h +++ b/sound/pci/ice1712/wtm.h | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #define AK4114_ADDR 0x20 /*S/PDIF receiver*/ | 12 | #define AK4114_ADDR 0x20 /*S/PDIF receiver*/ |
| 13 | #define STAC9460_I2C_ADDR 0x54 /* ADC*2 | DAC*6 */ | 13 | #define STAC9460_I2C_ADDR 0x54 /* ADC*2 | DAC*6 */ |
| 14 | #define STAC9460_2_I2C_ADDR 0x56 /* ADC|DAC *2 */ | 14 | #define STAC9460_2_I2C_ADDR 0x56 /* ADC|DAC *2 */ |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | extern struct snd_ice1712_card_info snd_vt1724_wtm_cards[]; | 17 | extern struct snd_ice1712_card_info snd_vt1724_wtm_cards[]; |