summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-03-10 21:20:55 +0100
committerTakashi Iwai <tiwai@suse.de>2014-03-11 07:54:14 +0100
commitf1eaaf8fce87adfcaaa9e44459cb25c2dbe3dcd3 (patch)
treedb2539ef93a299678372991972737234720c23d5 /include/sound
parent5be50ac26635ba64339912943a88899a1f55f8e6 (diff)
Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
This reverts commit 83fc3bc09518d42e8f5073e2a65884701dfadf19. sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit a5f6ea29f9a918403629f8369ae55fac6b09cb53 ('sh: prefix sh-specific "CCR" and "CCR2" by "SH_"'). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/emu10k1.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index dfb42ca6d043..c46908c1bb3f 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -436,8 +436,6 @@
#define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */
#define CCCA_CURRADDR 0x18000008
-/* undefine CCR to avoid conflict with the definition for SH */
-#undef CCR
#define CCR 0x09 /* Cache control register */
#define CCR_CACHEINVALIDSIZE 0x07190009
#define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */