* [PATCH] Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
@ 2014-03-10 20:20 Geert Uytterhoeven
2014-03-11 6:54 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2014-03-10 20:20 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: Nobuhiro Iwamatsu, alsa-devel, linux-sh, linux-kernel,
Geert Uytterhoeven
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>
---
include/sound/emu10k1.h | 2 --
1 file changed, 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
2014-03-10 20:20 [PATCH] Revert "ALSA: emu10k1: Fix warning: "CCR" redefined" Geert Uytterhoeven
@ 2014-03-11 6:54 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2014-03-11 6:54 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Jaroslav Kysela, Nobuhiro Iwamatsu, alsa-devel, linux-sh, linux-kernel
At Mon, 10 Mar 2014 21:20:55 +0100,
Geert Uytterhoeven wrote:
>
> 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>
Thanks, applied.
Takashi
> ---
> include/sound/emu10k1.h | 2 --
> 1 file changed, 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 */
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-11 6:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-10 20:20 [PATCH] Revert "ALSA: emu10k1: Fix warning: "CCR" redefined" Geert Uytterhoeven
2014-03-11 6:54 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).