diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/sh | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/sh')
| -rw-r--r-- | sound/sh/aica.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sh/aica.c b/sound/sh/aica.c index a0df401ebb9f..94c6ea7fa7c2 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c | |||
| @@ -188,7 +188,7 @@ static void spu_reset(void) | |||
| 188 | spu_memset(0, 0, 0x200000 / 4); | 188 | spu_memset(0, 0, 0x200000 / 4); |
| 189 | /* Put ARM7 in endless loop */ | 189 | /* Put ARM7 in endless loop */ |
| 190 | local_irq_save(flags); | 190 | local_irq_save(flags); |
| 191 | ctrl_outl(0xea000002, SPU_MEMORY_BASE); | 191 | __raw_writel(0xea000002, SPU_MEMORY_BASE); |
| 192 | local_irq_restore(flags); | 192 | local_irq_restore(flags); |
| 193 | spu_enable(); | 193 | spu_enable(); |
| 194 | } | 194 | } |