Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Geert Uytterhoeven 11 years ago
parent
5be50ac266
commit
f1eaaf8fce
1 changed files with 0 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 2
      include/sound/emu10k1.h

+ 0 - 2
include/sound/emu10k1.h
View File 

@@ -436,8 +436,6 @@
 
 #define CCCA_CURRADDR_MASK	0x00ffffff	/* Current address of the selected channel		*/
 
 #define CCCA_CURRADDR_MASK	0x00ffffff	/* Current address of the selected channel		*/
 
 #define CCCA_CURRADDR		0x18000008
 
 #define CCCA_CURRADDR		0x18000008
 
 
 
-/* undefine CCR to avoid conflict with the definition for SH */
 
-#undef CCR
 
 #define CCR			0x09		/* Cache control register				*/
 
 #define CCR			0x09		/* Cache control register				*/
 
 #define CCR_CACHEINVALIDSIZE	0x07190009
 
 #define CCR_CACHEINVALIDSIZE	0x07190009
 
 #define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/
 
 #define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/