diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
| commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
| tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /sound/pci/sis7019.h | |
| parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
| parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
Diffstat (limited to 'sound/pci/sis7019.h')
| -rw-r--r-- | sound/pci/sis7019.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/sis7019.h b/sound/pci/sis7019.h index 013b6739a742..bc8c76819408 100644 --- a/sound/pci/sis7019.h +++ b/sound/pci/sis7019.h | |||
| @@ -203,7 +203,7 @@ | |||
| 203 | #define SIS_WEISR_B 0xac | 203 | #define SIS_WEISR_B 0xac |
| 204 | 204 | ||
| 205 | 205 | ||
| 206 | /* Playback DMA parameters (paramter RAM) */ | 206 | /* Playback DMA parameters (parameter RAM) */ |
| 207 | #define SIS_PLAY_DMA_OFFSET 0x0000 | 207 | #define SIS_PLAY_DMA_OFFSET 0x0000 |
| 208 | #define SIS_PLAY_DMA_SIZE 0x10 | 208 | #define SIS_PLAY_DMA_SIZE 0x10 |
| 209 | #define SIS_PLAY_DMA_ADDR(addr, num) \ | 209 | #define SIS_PLAY_DMA_ADDR(addr, num) \ |
| @@ -228,7 +228,7 @@ | |||
| 228 | #define SIS_PLAY_DMA_SSO_MASK 0xffff0000 | 228 | #define SIS_PLAY_DMA_SSO_MASK 0xffff0000 |
| 229 | #define SIS_PLAY_DMA_ESO_MASK 0x0000ffff | 229 | #define SIS_PLAY_DMA_ESO_MASK 0x0000ffff |
| 230 | 230 | ||
| 231 | /* Capture DMA parameters (paramter RAM) */ | 231 | /* Capture DMA parameters (parameter RAM) */ |
| 232 | #define SIS_CAPTURE_DMA_OFFSET 0x0800 | 232 | #define SIS_CAPTURE_DMA_OFFSET 0x0800 |
| 233 | #define SIS_CAPTURE_DMA_SIZE 0x10 | 233 | #define SIS_CAPTURE_DMA_SIZE 0x10 |
| 234 | #define SIS_CAPTURE_DMA_ADDR(addr, num) \ | 234 | #define SIS_CAPTURE_DMA_ADDR(addr, num) \ |