diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:57:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:57:01 -0500 |
| commit | 980f31c46b3c7895ad926fbb43c8edac6ce193ff (patch) | |
| tree | ec61a87b42ce8e6eb24554d8a56173ef75aefdd2 /include/sound/ak4114.h | |
| parent | 9e298f449e667833c4cafad040ce8025a8ba1eed (diff) | |
| parent | 6ef80706184be792499a4485a7957f2660b6a076 (diff) | |
Merge branch 'topic/ice1724-quartet' into topic/hda
Diffstat (limited to 'include/sound/ak4114.h')
| -rw-r--r-- | include/sound/ak4114.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h index d293d36a66b8..3ce69fd92523 100644 --- a/include/sound/ak4114.h +++ b/include/sound/ak4114.h | |||
| @@ -95,13 +95,13 @@ | |||
| 95 | 95 | ||
| 96 | /* AK4114_REG_IO0 */ | 96 | /* AK4114_REG_IO0 */ |
| 97 | #define AK4114_TX1E (1<<7) /* TX1 Output Enable (1 = enable) */ | 97 | #define AK4114_TX1E (1<<7) /* TX1 Output Enable (1 = enable) */ |
| 98 | #define AK4114_OPS12 (1<<2) /* Output Though Data Selector for TX1 pin */ | 98 | #define AK4114_OPS12 (1<<6) /* Output Data Selector for TX1 pin */ |
| 99 | #define AK4114_OPS11 (1<<1) /* Output Though Data Selector for TX1 pin */ | 99 | #define AK4114_OPS11 (1<<5) /* Output Data Selector for TX1 pin */ |
| 100 | #define AK4114_OPS10 (1<<0) /* Output Though Data Selector for TX1 pin */ | 100 | #define AK4114_OPS10 (1<<4) /* Output Data Selector for TX1 pin */ |
| 101 | #define AK4114_TX0E (1<<3) /* TX0 Output Enable (1 = enable) */ | 101 | #define AK4114_TX0E (1<<3) /* TX0 Output Enable (1 = enable) */ |
| 102 | #define AK4114_OPS02 (1<<2) /* Output Though Data Selector for TX0 pin */ | 102 | #define AK4114_OPS02 (1<<2) /* Output Data Selector for TX0 pin */ |
| 103 | #define AK4114_OPS01 (1<<1) /* Output Though Data Selector for TX0 pin */ | 103 | #define AK4114_OPS01 (1<<1) /* Output Data Selector for TX0 pin */ |
| 104 | #define AK4114_OPS00 (1<<0) /* Output Though Data Selector for TX0 pin */ | 104 | #define AK4114_OPS00 (1<<0) /* Output Data Selector for TX0 pin */ |
| 105 | 105 | ||
| 106 | /* AK4114_REG_IO1 */ | 106 | /* AK4114_REG_IO1 */ |
| 107 | #define AK4114_EFH1 (1<<7) /* Interrupt 0 pin Hold */ | 107 | #define AK4114_EFH1 (1<<7) /* Interrupt 0 pin Hold */ |