From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754423AbaCKGyl (ORCPT ); Tue, 11 Mar 2014 02:54:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47092 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752787AbaCKGyj (ORCPT ); Tue, 11 Mar 2014 02:54:39 -0400 Date: Tue, 11 Mar 2014 07:54:38 +0100 Message-ID: From: Takashi Iwai To: Geert Uytterhoeven Cc: Jaroslav Kysela , Nobuhiro Iwamatsu , 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" In-Reply-To: <1394482855-18836-1-git-send-email-geert@linux-m68k.org> References: <1394482855-18836-1-git-send-email-geert@linux-m68k.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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 >