diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/sound/cs4231-regs.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/sound/cs4231-regs.h')
| -rw-r--r-- | include/sound/cs4231-regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h index f1490265c9b8..e8d1f3e31f9e 100644 --- a/include/sound/cs4231-regs.h +++ b/include/sound/cs4231-regs.h | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #define CS4231_IFACE_CTRL 0x09 /* interface control - bits 7-2 MCE */ | 45 | #define CS4231_IFACE_CTRL 0x09 /* interface control - bits 7-2 MCE */ |
| 46 | #define CS4231_PIN_CTRL 0x0a /* pin control */ | 46 | #define CS4231_PIN_CTRL 0x0a /* pin control */ |
| 47 | #define CS4231_TEST_INIT 0x0b /* test and initialization */ | 47 | #define CS4231_TEST_INIT 0x0b /* test and initialization */ |
| 48 | #define CS4231_MISC_INFO 0x0c /* miscellaneaous information */ | 48 | #define CS4231_MISC_INFO 0x0c /* miscellaneous information */ |
| 49 | #define CS4231_LOOPBACK 0x0d /* loopback control */ | 49 | #define CS4231_LOOPBACK 0x0d /* loopback control */ |
| 50 | #define CS4231_PLY_UPR_CNT 0x0e /* playback upper base count */ | 50 | #define CS4231_PLY_UPR_CNT 0x0e /* playback upper base count */ |
| 51 | #define CS4231_PLY_LWR_CNT 0x0f /* playback lower base count */ | 51 | #define CS4231_PLY_LWR_CNT 0x0f /* playback lower base count */ |