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 /include/sound/emu10k1.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/sound/emu10k1.h')
| -rw-r--r-- | include/sound/emu10k1.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 7dc97d12253c..4f865df42f0f 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h | |||
| @@ -438,6 +438,8 @@ | |||
| 438 | #define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */ | 438 | #define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */ |
| 439 | #define CCCA_CURRADDR 0x18000008 | 439 | #define CCCA_CURRADDR 0x18000008 |
| 440 | 440 | ||
| 441 | /* undefine CCR to avoid conflict with the definition for SH */ | ||
| 442 | #undef CCR | ||
| 441 | #define CCR 0x09 /* Cache control register */ | 443 | #define CCR 0x09 /* Cache control register */ |
| 442 | #define CCR_CACHEINVALIDSIZE 0x07190009 | 444 | #define CCR_CACHEINVALIDSIZE 0x07190009 |
| 443 | #define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */ | 445 | #define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */ |