mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jaroslav Kysela <perex@perex.cz>,
	Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>,
	alsa-devel@alsa-project.org, linux-sh@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
Date: Tue, 11 Mar 2014 07:54:38 +0100	[thread overview]
Message-ID: <s5hy50hfcnl.wl%tiwai@suse.de> (raw)
In-Reply-To: <1394482855-18836-1-git-send-email-geert@linux-m68k.org>

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
> 

      reply	other threads:[~2014-03-11  6:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-10 20:20 Geert Uytterhoeven
2014-03-11  6:54 ` Takashi Iwai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5hy50hfcnl.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=nobuhiro.iwamatsu.yj@renesas.com \
    --cc=perex@perex.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®