diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-01 10:32:18 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-01 10:32:18 -0500 |
| commit | cf54d47c13c2b171f946289de445102c676d4258 (patch) | |
| tree | c7e88f33402257f3e06bc708e58843518d8ca17b /sound/soc/codecs/ad1836.h | |
| parent | 88d686027bb43f585914c77dd363f6e817b42c2a (diff) | |
| parent | bda63586bc5929e97288cdb371bb6456504867ed (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/ad1836.h')
| -rw-r--r-- | sound/soc/codecs/ad1836.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ad1836.h b/sound/soc/codecs/ad1836.h index 444747f0db26..dd7be0dbbc58 100644 --- a/sound/soc/codecs/ad1836.h +++ b/sound/soc/codecs/ad1836.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #define AD1836_ADC_CTRL2 13 | 35 | #define AD1836_ADC_CTRL2 13 |
| 36 | #define AD1836_ADC_WORD_LEN_MASK 0x30 | 36 | #define AD1836_ADC_WORD_LEN_MASK 0x30 |
| 37 | #define AD1836_ADC_WORD_OFFSET 5 | 37 | #define AD1836_ADC_WORD_OFFSET 4 |
| 38 | #define AD1836_ADC_SERFMT_MASK (7 << 6) | 38 | #define AD1836_ADC_SERFMT_MASK (7 << 6) |
| 39 | #define AD1836_ADC_SERFMT_PCK256 (0x4 << 6) | 39 | #define AD1836_ADC_SERFMT_PCK256 (0x4 << 6) |
| 40 | #define AD1836_ADC_SERFMT_PCK128 (0x5 << 6) | 40 | #define AD1836_ADC_SERFMT_PCK128 (0x5 << 6) |