aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 00:54:37 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 00:54:37 -0400
commit6a302358d87fedaf7bda12b8e909265ebf1ce674 (patch)
tree9bb5d79d812d531ae7031fe4aecf18151e41f716 /sound
parent8e268f333012c62fc6a5a10e1e2a19c1c389853e (diff)
parente06c4e5775b1efc4e476f2430439e45867775f5f (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23: sh: Fix fs.h removal from mm.h regressions. sh: fix get_wchan() for SH kernels without framepointers sh: arch/sh/boot - fix shell usage rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts. sh: remove support for sh7300 and solution engine 7300 sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies. sh: Kill off virt_to_bus()/bus_to_virt(). sh: sh-sci - fix SH7708 support sh: Restrict DSP support to specific CPUs. sh: Silence sq compile warning on sh4 nommu. sh: Kill the rest of the SE73180 cruft. sh: remove support for sh73180 and solution engine 73180 sh: remove old broken pint code sh: Reclaim beginning of P3 space for vmalloc area. sh: Fix Dreamcast DMA issues. sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.
Diffstat (limited to 'sound')
-rw-r--r--sound/sh/aica.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sh/aica.h b/sound/sh/aica.h
index 8c11e3d10a50..d098baaa0116 100644
--- a/sound/sh/aica.h
+++ b/sound/sh/aica.h
@@ -52,7 +52,7 @@
52#define AICA_CHANNEL1_OFFSET 0x21000 52#define AICA_CHANNEL1_OFFSET 0x21000
53#define CHANNEL_OFFSET 0x10000 53#define CHANNEL_OFFSET 0x10000
54 54
55#define AICA_DMA_CHANNEL 0 55#define AICA_DMA_CHANNEL 5
56#define AICA_DMA_MODE 5 56#define AICA_DMA_MODE 5
57 57
58#define SND_AICA_DRIVER "AICA" 58#define SND_AICA_DRIVER "AICA"