diff options
| author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2010-10-17 23:20:39 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-18 01:45:44 -0400 |
| commit | 83fc3bc09518d42e8f5073e2a65884701dfadf19 (patch) | |
| tree | 62357530c7257c5f305d32dd9a6139ca04b8b6df /include/sound | |
| parent | 84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (diff) | |
ALSA: emu10k1: Fix warning: "CCR" redefined
CCR is defined in emu10k1, but SuperH is defined too.
If user use this driver with SuperH, it becomes a double definition.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -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 */ |